projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull asus into release branch
[powerpc.git]
/
kernel
/
sysctl.c
diff --git
a/kernel/sysctl.c
b/kernel/sysctl.c
index
34b2301
..
c904748
100644
(file)
--- a/
kernel/sysctl.c
+++ b/
kernel/sysctl.c
@@
-846,7
+846,8
@@
static ctl_table vm_table[] = {
.extra2 = &one_hundred,
},
#endif
.extra2 = &one_hundred,
},
#endif
-#ifdef CONFIG_X86_32
+#if defined(CONFIG_X86_32) || \
+ (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL))
{
.ctl_name = VM_VDSO_ENABLED,
.procname = "vdso_enabled",
{
.ctl_name = VM_VDSO_ENABLED,
.procname = "vdso_enabled",
@@
-1675,7
+1676,7
@@
static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp,
{
int op;
{
int op;
- if (!capable(CAP_SYS_ADMIN))
+ if (
write &&
!capable(CAP_SYS_ADMIN))
return -EPERM;
op = OP_OR;
return -EPERM;
op = OP_OR;