28 files changed, 52 insertions, 52 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 0a722e77c143..6bbd93dd186a 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -348,7 +348,7 @@ static void __init setup_processor(void)
                cpu_name, processor_id, (int)processor_id & 15,
                proc_arch[cpu_architecture()], cr_alignment);
 
-        sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS);
+        sprintf(init_utsname()->machine, "%s%c", list->arch_name, ENDIANNESS);
         sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
         elf_hwcap = list->elf_hwcap;
 #ifndef CONFIG_ARM_THUMB
diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c
index e7eb070f794f..466ddb54b44f 100644
--- a/arch/arm26/kernel/setup.c
+++ b/arch/arm26/kernel/setup.c
@@ -143,7 +143,7 @@ static void __init setup_processor(void)
 
         dump_cpu_info();
 
-        sprintf(system_utsname.machine, "%s", list->arch_name);
+        sprintf(init_utsname()->machine, "%s", list->arch_name);
         sprintf(elf_platform, "%s", list->elf_name);
         elf_hwcap = list->elf_hwcap;
 
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
index 7af3d5d43e43..ca8b45a0fe2e 100644
--- a/arch/cris/kernel/setup.c
+++ b/arch/cris/kernel/setup.c
@@ -160,7 +160,7 @@ setup_arch(char **cmdline_p)
         show_etrax_copyright();
 
         /* Setup utsname */
-        strcpy(system_utsname.machine, cris_machine_name);
+        strcpy(init_utsname()->machine, cris_machine_name);
 }
 
 static void *c_start(struct seq_file *m, loff_t *pos)
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 96cd0232e1e0..dad02a960e03 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -297,9 +297,9 @@ void show_regs(struct pt_regs * regs)
         if (user_mode_vm(regs))
                 printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
         printk(" EFLAGS: %08lx    %s  (%s %.*s)\n",
-               regs->eflags, print_tainted(), system_utsname.release,
-               (int)strcspn(system_utsname.version, " "),
-               system_utsname.version);
+               regs->eflags, print_tainted(), init_utsname()->release,
+               (int)strcspn(init_utsname()->version, " "),
+               init_utsname()->version);
         printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
                 regs->eax,regs->ebx,regs->ecx,regs->edx);
         printk("ESI: %08lx EDI: %08lx EBP: %08lx",
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 6820b8d643c7..00489b706d27 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -357,9 +357,9 @@ void show_registers(struct pt_regs *regs)
                 KERN_EMERG "EIP:    %04x:[<%08lx>]    %s VLI\n"
                 KERN_EMERG "EFLAGS: %08lx   (%s %.*s)\n",
                 smp_processor_id(), 0xffff & regs->xcs, regs->eip,
-                print_tainted(), regs->eflags, system_utsname.release,
-                (int)strcspn(system_utsname.version, " "),
-                system_utsname.version);
+                print_tainted(), regs->eflags, init_utsname()->release,
+                (int)strcspn(init_utsname()->version, " "),
+                init_utsname()->version);
         print_symbol(KERN_EMERG "EIP is at %s\n", regs->eip);
         printk(KERN_EMERG "eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",
                 regs->eax, regs->ebx, regs->ecx, regs->edx);
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a127a1e3c097..7b2f6452ba72 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -424,7 +424,7 @@ void show_regs(struct pt_regs * regs)
         printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
                regs->nip, regs->link, regs->ctr);
         printk("REGS: %p TRAP: %04lx   %s  (%s)\n",
-               regs, regs->trap, print_tainted(), system_utsname.release);
+               regs, regs->trap, print_tainted(), init_utsname()->release);
         printk("MSR: "REG" ", regs->msr);
         printbits(regs->msr, msr_bits);
         printk("  CR: %08lX  XER: %08lX\n", regs->ccr, regs->xer);
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 962ad5ebc767..cda2dbe70a76 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -414,7 +414,7 @@ void __init setup_system(void)
         smp_release_cpus();
 #endif
 
-        printk("Starting Linux PPC64 %s\n", system_utsname.version);
+        printk("Starting Linux PPC64 %s\n", init_utsname()->version);
 
         printk("-----------------------------------------------------\n");
         printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 8ed362140452..98189d8efaca 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -342,7 +342,7 @@ static int __init pSeries_init_panel(void)
 {
         /* Manually leave the kernel version on the panel. */
         ppc_md.progress("Linux ppc64\n", 0);
-        ppc_md.progress(system_utsname.release, 0);
+        ppc_md.progress(init_utsname()->version, 0);
 
         return 0;
 }
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 5f587332234a..77491cf9b259 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -459,7 +459,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 seq_printf(m, "machine\t\t: %s\n", get_system_type());
 
         seq_printf(m, "processor\t: %d\n", cpu);
-        seq_printf(m, "cpu family\t: %s\n", system_utsname.machine);
+        seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine);
         seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
 
         show_cpuflags(m);
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 55005710dcbb..97d88e7902f7 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -167,7 +167,7 @@ static char *usage_string =
 
 static int __init uml_version_setup(char *line, int *add)
 {
-        printf("%s\n", system_utsname.release);
+        printf("%s\n", init_utsname()->release);
         exit(0);
 
         return 0;
@@ -278,7 +278,7 @@ static int __init Usage(char *line, int *add)
 {
         const char **p;
 
-        printf(usage_string, system_utsname.release);
+        printf(usage_string, init_utsname()->release);
         p = &__uml_help_start;
         while (p < &__uml_help_end) {
                 printf("%s", *p);
@@ -403,7 +403,7 @@ int linux_main(int argc, char **argv)
         /* Reserve up to 4M after the current brk */
         uml_reserved = ROUND_4M(brk_start) + (1 << 22);
 
-        setup_machinename(system_utsname.machine);
+        setup_machinename(init_utsname()->machine);
 
 #ifdef CONFIG_CMDLINE_ON_HOST
         argv1_begin = argv[1];
diff --git a/arch/um/sys-x86_64/sysrq.c b/arch/um/sys-x86_64/sysrq.c
index d0a25af19a5b..ce3e07fcf283 100644
--- a/arch/um/sys-x86_64/sysrq.c
+++ b/arch/um/sys-x86_64/sysrq.c
@@ -16,7 +16,7 @@ void __show_regs(struct pt_regs * regs)
         printk("\n");
         print_modules();
         printk("Pid: %d, comm: %.20s %s %s\n",
-               current->pid, current->comm, print_tainted(), system_utsname.release);
+               current->pid, current->comm, print_tainted(), init_utsname()->release);
         printk("RIP: %04lx:[<%016lx>] ", PT_REGS_CS(regs) & 0xffff,
                PT_REGS_RIP(regs));
         printk("\nRSP: %016lx  EFLAGS: %08lx\n", PT_REGS_RSP(regs),
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 458006ae19f3..de10cb8a2c97 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -294,9 +294,9 @@ void __show_regs(struct pt_regs * regs)
         print_modules();
         printk("Pid: %d, comm: %.20s %s %s %.*s\n",
                 current->pid, current->comm, print_tainted(),
-                system_utsname.release,
-                (int)strcspn(system_utsname.version, " "),
-                system_utsname.version);
+                init_utsname()->release,
+                (int)strcspn(init_utsname()->version, " "),
+                init_utsname()->version);
         printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip);
         printk_address(regs->rip); 
         printk("RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss, regs->rsp,
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 42eaed88c281..a5456108dbad 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1601,7 +1601,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
         dev->mmap = ipath_mmap;
 
         snprintf(dev->node_desc, sizeof(dev->node_desc),
-                 IPATH_IDSTR " %s", system_utsname.nodename);
+                 IPATH_IDSTR " %s", init_utsname()->nodename);
 
         ret = ib_register_device(dev);
         if (ret)
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index bf00fa2537bb..8dac2ba82bb9 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -684,7 +684,7 @@ int __init led_init(void)
         int ret;
 
         snprintf(lcd_text_default, sizeof(lcd_text_default),
-                "Linux %s", system_utsname.release);
+                "Linux %s", init_utsname()->release);
 
         /* Work around the buggy PDC of KittyHawk-machines */
         switch (CPU_HVERSION) {
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index ae4106458991..1b53afb1cb57 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -933,8 +933,8 @@ lpfc_fdmi_cmd(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, int cmdcode)
                         ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
                         ae->ad.bits.AttrType = be16_to_cpu(OS_NAME_VERSION);
                         sprintf(ae->un.OsNameVersion, "%s %s %s",
-                                system_utsname.sysname, system_utsname.release,
-                                system_utsname.version);
+                                init_utsname()->sysname, init_utsname()->release,
+                                init_utsname()->version);
                         len = strlen(ae->un.OsNameVersion);
                         len += (len & 3) ? (4 - (len & 3)) : 4;
                         ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
@@ -1052,7 +1052,7 @@ lpfc_fdmi_cmd(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, int cmdcode)
                                                           size);
                                 ae->ad.bits.AttrType = be16_to_cpu(HOST_NAME);
                                 sprintf(ae->un.HostName, "%s",
-                                        system_utsname.nodename);
+                                        init_utsname()->nodename);
                                 len = strlen(ae->un.HostName);
                                 len += (len & 3) ? (4 - (len & 3)) : 4;
                                 ae->ad.bits.AttrLen =
@@ -1140,7 +1140,7 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba)
 
         ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, FDMI_DID);
         if (ndlp) {
-                if (system_utsname.nodename[0] != '\0') {
+                if (init_utsname()->nodename[0] != '\0') {
                         lpfc_fdmi_cmd(phba, ndlp, SLI_MGMT_DHBA);
                 } else {
                         mod_timer(&phba->fc_fdmitmo, jiffies + HZ * 60);
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 37f9f5e7425d..e658089f7b50 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -318,8 +318,8 @@ static int rh_string (
 
         // id 3 == vendor description
         } else if (id == 3) {
-                snprintf (buf, sizeof buf, "%s %s %s", system_utsname.sysname,
-                        system_utsname.release, hcd->driver->description);
+                snprintf (buf, sizeof buf, "%s %s %s", init_utsname()->sysname,
+                        init_utsname()->release, hcd->driver->description);
 
         // unsupported IDs --> "protocol stall"
         } else
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 366dc0a9e52c..1c17d26d03b8 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2260,7 +2260,7 @@ eth_bind (struct usb_gadget *gadget)
                 return -ENODEV;
         }
         snprintf (manufacturer, sizeof manufacturer, "%s %s/%s",
-                system_utsname.sysname, system_utsname.release,
+                init_utsname()->sysname, init_utsname()->release,
                 gadget->name);
 
         /* If there's an RNDIS configuration, that's what Windows wants to
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index c83d3b6c68f2..8b975d15538d 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -4001,7 +4001,7 @@ static int __init fsg_bind(struct usb_gadget *gadget)
         usb_gadget_set_selfpowered(gadget);
 
         snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
-                        system_utsname.sysname, system_utsname.release,
+                        init_utsname()->sysname, init_utsname()->release,
                         gadget->name);
 
         /* On a real device, serial[] would be loaded from permanent
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index b68cecd57411..83601d4009e3 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -1189,7 +1189,7 @@ static int __devinit gmidi_bind(struct usb_gadget *gadget)
                 strlcpy(manufacturer, iManufacturer, sizeof(manufacturer));
         } else {
                 snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
-                        system_utsname.sysname, system_utsname.release,
+                        init_utsname()->sysname, init_utsname()->release,
                         gadget->name);
         }
         if (iProduct) {
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 489a85e58bca..208e55a667ac 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -1434,7 +1434,7 @@ static int __init gs_bind(struct usb_gadget *gadget)
                 return -ENOMEM;
 
         snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
-                system_utsname.sysname, system_utsname.release,
+                init_utsname()->sysname, init_utsname()->release,
                 gadget->name);
 
         memset(dev, 0, sizeof(struct gs_dev));
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index b7018ee487ea..0f809dd68492 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -1242,7 +1242,7 @@ autoconf_fail:
                 EP_OUT_NAME, EP_IN_NAME);
 
         snprintf (manufacturer, sizeof manufacturer, "%s %s with %s",
-                system_utsname.sysname, system_utsname.release,
+                init_utsname()->sysname, init_utsname()->release,
                 gadget->name);
 
         return 0;
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index d1705ab8136e..22b4c35dcfe3 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -111,7 +111,7 @@ static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
         bytes_ret = cifs_strtoUCS((__le16 *)bcc_ptr, "Linux version ", 32,
                                   nls_cp);
         bcc_ptr += 2 * bytes_ret;
-        bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release,
+        bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, init_utsname()->release,
                                   32, nls_cp);
         bcc_ptr += 2 * bytes_ret;
         bcc_ptr += 2; /* trailing null */
@@ -158,8 +158,8 @@ static void ascii_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
 
         strcpy(bcc_ptr, "Linux version ");
         bcc_ptr += strlen("Linux version ");
-        strcpy(bcc_ptr, system_utsname.release);
-        bcc_ptr += strlen(system_utsname.release) + 1;
+        strcpy(bcc_ptr, init_utsname()->release);
+        bcc_ptr += strlen(init_utsname()->release) + 1;
 
         strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
         bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h
index 2a9e4ee5904d..592ffeeda45e 100644
--- a/include/asm-i386/bugs.h
+++ b/include/asm-i386/bugs.h
@@ -189,6 +189,6 @@ static void __init check_bugs(void)
         check_fpu();
         check_hlt();
         check_popad();
-        system_utsname.machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
+        init_utsname()->machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
         alternative_instructions(); 
 }
diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index b4000c8bf31b..beeea40f549e 100644
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -18,7 +18,7 @@ static void __init check_bugs(void)
 {
         extern char *get_cpu_subtype(void);
         extern unsigned long loops_per_jiffy;
-        char *p= &system_utsname.machine[2]; /* "sh" */
+        char *p= &init_utsname()->machine[2]; /* "sh" */
 
         cpu_data->loops_per_jiffy = loops_per_jiffy;
 
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);
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 99d50065aa79..f8ce84759159 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -366,7 +366,7 @@ static int __init ic_defaults(void)
          */
          
         if (!ic_host_name_set)
-                sprintf(system_utsname.nodename, "%u.%u.%u.%u", NIPQUAD(ic_myaddr));
+                sprintf(init_utsname()->nodename, "%u.%u.%u.%u", NIPQUAD(ic_myaddr));
 
         if (root_server_addr == INADDR_NONE)
                 root_server_addr = ic_servaddr;
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index 3ebc34919c76..a444bfe2cf74 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -96,11 +96,11 @@ static void snd_sndstat_proc_read(struct snd_info_entry *entry,
 {
         snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n");
         snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n",
-                    system_utsname.sysname,
-                    system_utsname.nodename,
-                    system_utsname.release,
-                    system_utsname.version,
-                    system_utsname.machine);
+                    init_utsname()->sysname,
+                    init_utsname()->nodename,
+                    init_utsname()->release,
+                    init_utsname()->version,
+                    init_utsname()->machine);
         snd_iprintf(buffer, "Config options: 0\n");
         snd_iprintf(buffer, "\nInstalled drivers: \n");
         snd_iprintf(buffer, "Type 10: ALSA emulation\n");