X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=kernel%2Fsysctl.c;h=c904748f2290d8c48edca2dd451e1d71f4593b49;hb=0d64a233fe6a8fd45a062fe125159854ffed60c7;hp=3ca1d5ff0319ea70321f196ab28b7b368179f271;hpb=4559b438225b01942e1661759db0df55883b1bc0;p=powerpc.git

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 3ca1d5ff03..c904748f22 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -846,7 +846,8 @@ static ctl_table vm_table[] = {
 		.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",
@@ -1359,8 +1360,7 @@ void unregister_sysctl_table(struct ctl_table_header * header)
 }
 
 #else /* !CONFIG_SYSCTL */
-struct ctl_table_header * register_sysctl_table(ctl_table * table,
-						int insert_at_head)
+struct ctl_table_header *register_sysctl_table(ctl_table * table)
 {
 	return NULL;
 }
@@ -1676,7 +1676,7 @@ static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp,
 {
 	int op;
 
-	if (!capable(CAP_SYS_ADMIN))
+	if (write && !capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
 	op = OP_OR;