mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 56170e064e2b21ce204f0817733e92f1730541ea Mon Sep 17 00:00:00 2001
|
|
From: Igor Gnatenko <ignatenko@redhat.com>
|
|
Date: Wed, 7 Feb 2018 13:53:10 +0100
|
|
Subject: [PATCH] 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)
|
|
---
|
|
sysdeps/unix/sysv/linux/bits/mman-shared.h | 2 +-
|
|
1 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/bits/mman-shared.h b/sysdeps/unix/sysv/linux/bits/mman-shared.h
|
|
index 7715e68..d15ba95 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. */
|
|
--
|
|
2.9.3
|