aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2025-01-02 17:26:28 +0000
committerSam James <sam@gentoo.org>2025-01-02 17:58:06 +0000
commite9be7701e6cd2b7be5454efaece3abc7ec9102ce (patch)
tree7035df759607ea652c26b15c4ce4e2d52012eb14
parent0ab62fa4f6c5ed24afe9a51f13aa759f5e88ec01 (diff)
downloadglibc-e9be7701e6cd2b7be5454efaece3abc7ec9102ce.zip
glibc-e9be7701e6cd2b7be5454efaece3abc7ec9102ce.tar.gz
glibc-e9be7701e6cd2b7be5454efaece3abc7ec9102ce.tar.bz2
mlock, mlock2, munlock: Use __attr_access_none macro
This fixes build failures using GCC 7.5.0 against glibc headers, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118194#c5. Followup to 013106ae677af9836614ace1a01d25b63fa555a7. Reported-by: vvinayag@arm.com
-rw-r--r--misc/sys/mman.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/mman-shared.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/sys/mman.h b/misc/sys/mman.h
index a2eaf69..de5cb89 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 bfbccc1..3159097 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