2 files changed, 22 insertions, 9 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f7a04d0daf07..b0ea97554473 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -182,6 +182,14 @@ config TASK_DELAY_ACCT
 
           Say N if unsure.
 
+config UTS_NS
+        bool "UTS Namespaces"
+        default n
+        help
+          Support uts namespaces.  This allows containers, i.e.
+          vservers, to use uts namespaces to provide different
+          uts info for different servers.  If unsure, say N.
+
 config AUDIT
         bool "Auditing support"
         depends on NET
diff --git a/init/version.c b/init/version.c
index e290802c6bd2..8f28344d9c70 100644
--- a/init/version.c
+++ b/init/version.c
@@ -12,22 +12,27 @@
 #include <linux/utsname.h>
 #include <linux/utsrelease.h>
 #include <linux/version.h>
+#include <linux/sched.h>
 
 #define version(a) Version_ ## a
 #define version_string(a) version(a)
 
 int version_string(LINUX_VERSION_CODE);
 
-struct new_utsname system_utsname = {
-        .sysname        = UTS_SYSNAME,
-        .nodename       = UTS_NODENAME,
-        .release        = UTS_RELEASE,
-        .version        = UTS_VERSION,
-        .machine        = UTS_MACHINE,
-        .domainname     = UTS_DOMAINNAME,
+struct uts_namespace init_uts_ns = {
+        .kref = {
+                .refcount       = ATOMIC_INIT(2),
+        },
+        .name = {
+                .sysname        = UTS_SYSNAME,
+                .nodename       = UTS_NODENAME,
+                .release        = UTS_RELEASE,
+                .version        = UTS_VERSION,
+                .machine        = UTS_MACHINE,
+                .domainname     = UTS_DOMAINNAME,
+        },
 };
-
-EXPORT_SYMBOL(system_utsname);
+EXPORT_SYMBOL_GPL(init_uts_ns);
 
 const char linux_banner[] =
         "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"