diff --git a/misc/sys/mman.h b/misc/sys/mman.h
index a2eaf69c82..de5cb8976f 100644
--- a/misc/sys/mman.h
+++ b/misc/sys/mman.h
@@ -101,11 +101,11 @@ extern int posix_madvise (void *__addr, size_t __len, int __advice) __THROW;
 /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to
    be memory resident.  */
 extern int mlock (const void *__addr, size_t __len) __THROW
-    __attr_access ((__none__, 1));
+    __attr_access_none (1);
 
 /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN).  */
 extern int munlock (const void *__addr, size_t __len) __THROW
-    __attr_access ((__none__, 1));
+    __attr_access_none (1);
 
 /* Cause all currently mapped pages of the process to be memory resident
    until unlocked by a call to the `munlockall', until the process exits,
diff --git a/sysdeps/unix/sysv/linux/bits/mman-shared.h b/sysdeps/unix/sysv/linux/bits/mman-shared.h
index bfbccc14d6..31590979b9 100644
--- a/sysdeps/unix/sysv/linux/bits/mman-shared.h
+++ b/sysdeps/unix/sysv/linux/bits/mman-shared.h
@@ -57,7 +57,7 @@ int memfd_create (const char *__name, unsigned int __flags) __THROW;
 /* Lock pages from ADDR (inclusive) to ADDR + LENGTH (exclusive) into
    memory.  FLAGS is a combination of the MLOCK_* flags above.  */
 int mlock2 (const void *__addr, size_t __length, unsigned int __flags) __THROW
-    __attr_access ((__none__, 1));
+    __attr_access_none (1);
 
 /* Allocate a new protection key, with the PKEY_DISABLE_* bits
    specified in ACCESS_RESTRICTIONS.  The protection key mask for the