diff options
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 34b2301276ce..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", |
| @@ -1675,7 +1676,7 @@ static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp, | |||
| 1675 | { | 1676 | { |
| 1676 | int op; | 1677 | int op; |
| 1677 | 1678 | ||
| 1678 | if (!capable(CAP_SYS_ADMIN)) | 1679 | if (write && !capable(CAP_SYS_ADMIN)) |
| 1679 | return -EPERM; | 1680 | return -EPERM; |
| 1680 | 1681 | ||
| 1681 | op = OP_OR; | 1682 | op = OP_OR; |
