diff options
| author | Igor Gnatenko <ignatenko@redhat.com> | 2018-02-07 13:53:10 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-02-07 13:53:10 +0100 |
| commit | 56170e064e2b21ce204f0817733e92f1730541ea (patch) | |
| tree | 647b913af09cd29a5d86b1f35777a6fe5c2a1c2d | |
| parent | 00c5a2d77a541fa005cb460bd1a45f51f1aa71ea (diff) | |
| download | glibc-56170e064e2b21ce204f0817733e92f1730541ea.tar.gz glibc-56170e064e2b21ce204f0817733e92f1730541ea.tar.xz glibc-56170e064e2b21ce204f0817733e92f1730541ea.zip | |
Linux: use reserved name __key in pkey_get [BZ #22797]
_key is not reserved name and we should avoid using that. It seems that it was simple typo when pkey_* was implemented. (cherry picked from commit 388ff7bd0d57d7061fdd39a2f26f65687e8058da)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/mman-shared.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 65ebfbcb52..cfe43e3bc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-02-07 Igor Gnatenko <ignatenko@redhat.com> + + [BZ #22797] + * sysdeps/unix/sysv/linux/bits/mman-shared.h (pkey_get): Add + missing second underscore to parameter name. + 2018-02-05 H.J. Lu <hongjiu.lu@intel.com> [BZ #22638] diff --git a/NEWS b/NEWS index 4bb08b1dbf..1e4cb10612 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ The following bugs are resolved with this release: [22638] sparc: static binaries are broken if glibc is built by gcc configured with --enable-default-pie + [22797] Linux: use reserved name __key in pkey_get Version 2.27 diff --git a/sysdeps/unix/sysv/linux/bits/mman-shared.h b/sysdeps/unix/sysv/linux/bits/mman-shared.h index 7715e680ca..d15ba95c9d 100644 --- a/sysdeps/unix/sysv/linux/bits/mman-shared.h +++ b/sysdeps/unix/sysv/linux/bits/mman-shared.h @@ -61,7 +61,7 @@ int pkey_set (int __key, unsigned int __access_rights) __THROW; /* Return the access rights for the current thread for KEY, which must have been allocated using pkey_alloc. */ -int pkey_get (int _key) __THROW; +int pkey_get (int __key) __THROW; /* Free an allocated protection key, which must have been allocated using pkey_alloc. */ |