diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 3ca1d5ff0319..c904748f2290 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -846,7 +846,8 @@ static ctl_table vm_table[] = { | |||
846 | .extra2 = &one_hundred, | 846 | .extra2 = &one_hundred, |
847 | }, | 847 | }, |
848 | #endif | 848 | #endif |
849 | #ifdef CONFIG_X86_32 | 849 | #if defined(CONFIG_X86_32) || \ |
850 | (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) | ||
850 | { | 851 | { |
851 | .ctl_name = VM_VDSO_ENABLED, | 852 | .ctl_name = VM_VDSO_ENABLED, |
852 | .procname = "vdso_enabled", | 853 | .procname = "vdso_enabled", |
@@ -1359,8 +1360,7 @@ void unregister_sysctl_table(struct ctl_table_header * header) | |||
1359 | } | 1360 | } |
1360 | 1361 | ||
1361 | #else /* !CONFIG_SYSCTL */ | 1362 | #else /* !CONFIG_SYSCTL */ |
1362 | struct ctl_table_header * register_sysctl_table(ctl_table * table, | 1363 | struct ctl_table_header *register_sysctl_table(ctl_table * table) |
1363 | int insert_at_head) | ||
1364 | { | 1364 | { |
1365 | return NULL; | 1365 | return NULL; |
1366 | } | 1366 | } |
@@ -1676,7 +1676,7 @@ static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp, | |||
1676 | { | 1676 | { |
1677 | int op; | 1677 | int op; |
1678 | 1678 | ||
1679 | if (!capable(CAP_SYS_ADMIN)) | 1679 | if (write && !capable(CAP_SYS_ADMIN)) |
1680 | return -EPERM; | 1680 | return -EPERM; |
1681 | 1681 | ||
1682 | op = OP_OR; | 1682 | op = OP_OR; |