X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=kernel%2Futsname_sysctl.c;h=c76c06466bfd07fe11fab8a592075ac0a38b807b;hb=de81225a8719494f5149980ea8a50de28da653f6;hp=324aa1341b5f9a2a4a437081782c70b27097c83b;hpb=39732acd968a007036ff3c504f1e6748024ef548;p=powerpc.git

diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
index 324aa1341b..c76c06466b 100644
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
@@ -18,10 +18,7 @@
 static void *get_uts(ctl_table *table, int write)
 {
 	char *which = table->data;
-#ifdef CONFIG_UTS_NS
-	struct uts_namespace *uts_ns = current->nsproxy->uts_ns;
-	which = (which - (char *)&init_uts_ns) + (char *)uts_ns;
-#endif
+
 	if (!write)
 		down_read(&uts_sem);
 	else
@@ -139,7 +136,7 @@ static struct ctl_table uts_root_table[] = {
 
 static int __init utsname_sysctl_init(void)
 {
-	register_sysctl_table(uts_root_table, 0);
+	register_sysctl_table(uts_root_table);
 	return 0;
 }