X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Futsname_sysctl.c;h=fe3a56c2256d7ee44e46813aeee597559ba29131;hb=8a0ca91e1db5de5eb5b18cfa919d52ff8be375af;hp=324aa1341b5f9a2a4a437081782c70b27097c83b;hpb=39732acd968a007036ff3c504f1e6748024ef548;p=linux-2.6

diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
index 324aa1341b..fe3a56c225 100644
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
@@ -18,10 +18,11 @@
 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;
+	struct uts_namespace *uts_ns;
+
+	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 +140,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;
 }