summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatteo Croce <mcroce@redhat.com>2020-01-24 16:51:27 +0100
committerWill Deacon <will@kernel.org>2020-02-10 11:24:57 +0000
commit2c614c1194f2803750c14b751871bd168dcc8054 (patch)
treeefb58500446e2173cebb1b6e42706110aec6779b
parent5cb7a1113f94cec20ff16d3981b94b7fdd8d73fa (diff)
downloadlinux-stable-2c614c1194f2803750c14b751871bd168dcc8054.tar.gz
linux-stable-2c614c1194f2803750c14b751871bd168dcc8054.tar.bz2
linux-stable-2c614c1194f2803750c14b751871bd168dcc8054.zip
arm64: use shared sysctl constants
Use shared sysctl variables for zero and one constants, as in commit eec4844fae7c ("proc/sysctl: add shared variables for range check") Fixes: 63f0c6037965 ("arm64: Introduce prctl() options to control the tagged user addresses ABI") Signed-off-by: Matteo Croce <mcroce@redhat.com> Signed-off-by: Will Deacon <will@kernel.org>
-rw-r--r--arch/arm64/kernel/process.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index bbb0f0c145f6..a480b6760808 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -608,8 +608,6 @@ long get_tagged_addr_ctrl(void)
* only prevents the tagged address ABI enabling via prctl() and does not
* disable it for tasks that already opted in to the relaxed ABI.
*/
-static int zero;
-static int one = 1;
static struct ctl_table tagged_addr_sysctl_table[] = {
{
@@ -618,8 +616,8 @@ static struct ctl_table tagged_addr_sysctl_table[] = {
.data = &tagged_addr_disabled,
.maxlen = sizeof(int),
.proc_handler = proc_dointvec_minmax,
- .extra1 = &zero,
- .extra2 = &one,
+ .extra1 = SYSCTL_ZERO,
+ .extra2 = SYSCTL_ONE,
},
{ }
};