X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=kernel%2Fsysctl.c;h=3b4efbe2644572a32576b1a591f003e9869699f0;hb=3ac88a41ff747b8c2f290f86b5243b2f8fce2cc0;hp=067554bda8b79ba3954f2dc653dfa4f25f98f09c;hpb=32c15bb978c0e6ff65b3012a6af5a14c899005ce;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 067554bda8b..3b4efbe2644 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1888,7 +1888,7 @@ int proc_dointvec_bset(struct ctl_table *table, int write, struct file *filp,
 		return -EPERM;
 	}
 
-	op = is_init(current) ? OP_SET : OP_AND;
+	op = is_global_init(current) ? OP_SET : OP_AND;
 	return do_proc_dointvec(table,write,filp,buffer,lenp,ppos,
 				do_proc_dointvec_bset_conv,&op);
 }
@@ -2278,7 +2278,7 @@ static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp
 	pid_t tmp;
 	int r;
 
-	tmp = pid_nr(cad_pid);
+	tmp = pid_nr_ns(cad_pid, current->nsproxy->pid_ns);
 
 	r = __do_proc_dointvec(&tmp, table, write, filp, buffer,
 			       lenp, ppos, NULL, NULL);