[PATCH] namespaces: utsname: use init_utsname when appropriate

In some places, particularly drivers and __init code, the init utsns is the
appropriate one to use.  This patch replaces those with a the init_utsname
helper.

Changes: Removed several uses of init_utsname().  Hope I picked all the
	right ones in net/ipv4/ipconfig.c.  These are now changed to
	utsname() (the per-process namespace utsname) in the previous
	patch (2/7)

[akpm@osdl.org: CIFS fix]
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Andrey Savochkin <saw@sw.ru>
Cc: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 8 insertions, 8 deletions

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index e596525669ed..4c0553461000 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -518,9 +518,9 @@ print_circular_bug_entry(struct lock_list *target, unsigned int depth)
 
 static void print_kernel_version(void)
 {
-        printk("%s %.*s\n", system_utsname.release,
-                (int)strcspn(system_utsname.version, " "),
-                system_utsname.version);
+        printk("%s %.*s\n", init_utsname()->release,
+                (int)strcspn(init_utsname()->version, " "),
+                init_utsname()->version);
 }
 
 /*
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 1b84313cbab5..99f9b7d177d6 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -906,7 +906,7 @@ static void init_header(struct swsusp_info *info)
         memset(info, 0, sizeof(struct swsusp_info));
         info->version_code = LINUX_VERSION_CODE;
         info->num_physpages = num_physpages;
-        memcpy(&info->uts, &system_utsname, sizeof(system_utsname));
+        memcpy(&info->uts, init_utsname(), sizeof(struct new_utsname));
         info->cpus = num_online_cpus();
         info->image_pages = nr_copy_pages;
         info->pages = nr_copy_pages + nr_meta_pages + 1;
@@ -1050,13 +1050,13 @@ static inline int check_header(struct swsusp_info *info)
                 reason = "kernel version";
         if (info->num_physpages != num_physpages)
                 reason = "memory size";
-        if (strcmp(info->uts.sysname,system_utsname.sysname))
+        if (strcmp(info->uts.sysname,init_utsname()->sysname))
                 reason = "system type";
-        if (strcmp(info->uts.release,system_utsname.release))
+        if (strcmp(info->uts.release,init_utsname()->release))
                 reason = "kernel release";
-        if (strcmp(info->uts.version,system_utsname.version))
+        if (strcmp(info->uts.version,init_utsname()->version))
                 reason = "version";
-        if (strcmp(info->uts.machine,system_utsname.machine))
+        if (strcmp(info->uts.machine,init_utsname()->machine))
                 reason = "machine";
         if (reason) {
                 printk(KERN_ERR "swsusp: Resume mismatch: %s\n", reason);