Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[pandora-kernel.git] / init / version.c

diff --git a/init/version.c b/init/version.c
index e290802..9d96d36 100644 (file)
--- a/init/version.c
+++ b/init/version.c
@@ -12,23 +12,24 @@
 #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);
-
-const char linux_banner[] =
-       "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
-       LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
+EXPORT_SYMBOL_GPL(init_uts_ns);