aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge E. Hallyn <serue@us.ibm.com>2006-10-02 05:18:13 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 10:57:21 -0400
commit96b644bdec977b97a45133e5b4466ba47a7a5e65 (patch)
tree4c6d1f0d54746aa06132628379b2a0efec5e1701
parente9ff3990f08e9a0c2839cc22808b01732ea5b3e4 (diff)
[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>
-rw-r--r--arch/arm/kernel/setup.c2
-rw-r--r--arch/arm26/kernel/setup.c2
-rw-r--r--arch/cris/kernel/setup.c2
-rw-r--r--arch/i386/kernel/process.c6
-rw-r--r--arch/i386/kernel/traps.c6
-rw-r--r--arch/powerpc/kernel/process.c2
-rw-r--r--arch/powerpc/kernel/setup_64.c2
-rw-r--r--arch/powerpc/platforms/pseries/setup.c2
-rw-r--r--arch/sh/kernel/setup.c2
-rw-r--r--arch/um/kernel/um_arch.c6
-rw-r--r--arch/um/sys-x86_64/sysrq.c2
-rw-r--r--arch/x86_64/kernel/process.c6
-rw-r--r--drivers/infiniband/hw/ipath/ipath_verbs.c2
-rw-r--r--drivers/parisc/led.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_ct.c8
-rw-r--r--drivers/usb/core/hcd.c4
-rw-r--r--drivers/usb/gadget/ether.c2
-rw-r--r--drivers/usb/gadget/file_storage.c2
-rw-r--r--drivers/usb/gadget/gmidi.c2
-rw-r--r--drivers/usb/gadget/serial.c2
-rw-r--r--drivers/usb/gadget/zero.c2
-rw-r--r--fs/cifs/sess.c6
-rw-r--r--include/asm-i386/bugs.h2
-rw-r--r--include/asm-sh/bugs.h2
-rw-r--r--kernel/lockdep.c6
-rw-r--r--kernel/power/snapshot.c10
-rw-r--r--net/ipv4/ipconfig.c2
-rw-r--r--sound/core/info_oss.c10
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)
348 cpu_name, processor_id, (int)processor_id & 15, 348 cpu_name, processor_id, (int)processor_id & 15,
349 proc_arch[cpu_architecture()], cr_alignment); 349 proc_arch[cpu_architecture()], cr_alignment);
350 350
351 sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS); 351 sprintf(init_utsname()->machine, "%s%c", list->arch_name, ENDIANNESS);
352 sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS); 352 sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
353 elf_hwcap = list->elf_hwcap; 353 elf_hwcap = list->elf_hwcap;
354#ifndef CONFIG_ARM_THUMB 354#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)
143 143
144 dump_cpu_info(); 144 dump_cpu_info();
145 145
146 sprintf(system_utsname.machine, "%s", list->arch_name); 146 sprintf(init_utsname()->machine, "%s", list->arch_name);
147 sprintf(elf_platform, "%s", list->elf_name); 147 sprintf(elf_platform, "%s", list->elf_name);
148 elf_hwcap = list->elf_hwcap; 148 elf_hwcap = list->elf_hwcap;
149 149
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)
160 show_etrax_copyright(); 160 show_etrax_copyright();
161 161
162 /* Setup utsname */ 162 /* Setup utsname */
163 strcpy(system_utsname.machine, cris_machine_name); 163 strcpy(init_utsname()->machine, cris_machine_name);
164} 164}
165 165
166static void *c_start(struct seq_file *m, loff_t *pos) 166static 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)
297 if (user_mode_vm(regs)) 297 if (user_mode_vm(regs))
298 printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp); 298 printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
299 printk(" EFLAGS: %08lx %s (%s %.*s)\n", 299 printk(" EFLAGS: %08lx %s (%s %.*s)\n",
300 regs->eflags, print_tainted(), system_utsname.release, 300 regs->eflags, print_tainted(), init_utsname()->release,
301 (int)strcspn(system_utsname.version, " "), 301 (int)strcspn(init_utsname()->version, " "),
302 system_utsname.version); 302 init_utsname()->version);
303 printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n", 303 printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
304 regs->eax,regs->ebx,regs->ecx,regs->edx); 304 regs->eax,regs->ebx,regs->ecx,regs->edx);
305 printk("ESI: %08lx EDI: %08lx EBP: %08lx", 305 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)
357 KERN_EMERG "EIP: %04x:[<%08lx>] %s VLI\n" 357 KERN_EMERG "EIP: %04x:[<%08lx>] %s VLI\n"
358 KERN_EMERG "EFLAGS: %08lx (%s %.*s)\n", 358 KERN_EMERG "EFLAGS: %08lx (%s %.*s)\n",
359 smp_processor_id(), 0xffff & regs->xcs, regs->eip, 359 smp_processor_id(), 0xffff & regs->xcs, regs->eip,
360 print_tainted(), regs->eflags, system_utsname.release, 360 print_tainted(), regs->eflags, init_utsname()->release,
361 (int)strcspn(system_utsname.version, " "), 361 (int)strcspn(init_utsname()->version, " "),
362 system_utsname.version); 362 init_utsname()->version);
363 print_symbol(KERN_EMERG "EIP is at %s\n", regs->eip); 363 print_symbol(KERN_EMERG "EIP is at %s\n", regs->eip);
364 printk(KERN_EMERG "eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n", 364 printk(KERN_EMERG "eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n",
365 regs->eax, regs->ebx, regs->ecx, regs->edx); 365 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)
424 printk("NIP: "REG" LR: "REG" CTR: "REG"\n", 424 printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
425 regs->nip, regs->link, regs->ctr); 425 regs->nip, regs->link, regs->ctr);
426 printk("REGS: %p TRAP: %04lx %s (%s)\n", 426 printk("REGS: %p TRAP: %04lx %s (%s)\n",
427 regs, regs->trap, print_tainted(), system_utsname.release); 427 regs, regs->trap, print_tainted(), init_utsname()->release);
428 printk("MSR: "REG" ", regs->msr); 428 printk("MSR: "REG" ", regs->msr);
429 printbits(regs->msr, msr_bits); 429 printbits(regs->msr, msr_bits);
430 printk(" CR: %08lX XER: %08lX\n", regs->ccr, regs->xer); 430 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)
414 smp_release_cpus(); 414 smp_release_cpus();
415#endif 415#endif
416 416
417 printk("Starting Linux PPC64 %s\n", system_utsname.version); 417 printk("Starting Linux PPC64 %s\n", init_utsname()->version);
418 418
419 printk("-----------------------------------------------------\n"); 419 printk("-----------------------------------------------------\n");
420 printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size); 420 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)
342{ 342{
343 /* Manually leave the kernel version on the panel. */ 343 /* Manually leave the kernel version on the panel. */
344 ppc_md.progress("Linux ppc64\n", 0); 344 ppc_md.progress("Linux ppc64\n", 0);
345 ppc_md.progress(system_utsname.release, 0); 345 ppc_md.progress(init_utsname()->version, 0);
346 346
347 return 0; 347 return 0;
348} 348}
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)
459 seq_printf(m, "machine\t\t: %s\n", get_system_type()); 459 seq_printf(m, "machine\t\t: %s\n", get_system_type());
460 460
461 seq_printf(m, "processor\t: %d\n", cpu); 461 seq_printf(m, "processor\t: %d\n", cpu);
462 seq_printf(m, "cpu family\t: %s\n", system_utsname.machine); 462 seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine);
463 seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype()); 463 seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
464 464
465 show_cpuflags(m); 465 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 =
167 167
168static int __init uml_version_setup(char *line, int *add) 168static int __init uml_version_setup(char *line, int *add)
169{ 169{
170 printf("%s\n", system_utsname.release); 170 printf("%s\n", init_utsname()->release);
171 exit(0); 171 exit(0);
172 172
173 return 0; 173 return 0;
@@ -278,7 +278,7 @@ static int __init Usage(char *line, int *add)
278{ 278{
279 const char **p; 279 const char **p;
280 280
281 printf(usage_string, system_utsname.release); 281 printf(usage_string, init_utsname()->release);
282 p = &__uml_help_start; 282 p = &__uml_help_start;
283 while (p < &__uml_help_end) { 283 while (p < &__uml_help_end) {
284 printf("%s", *p); 284 printf("%s", *p);
@@ -403,7 +403,7 @@ int linux_main(int argc, char **argv)
403 /* Reserve up to 4M after the current brk */ 403 /* Reserve up to 4M after the current brk */
404 uml_reserved = ROUND_4M(brk_start) + (1 << 22); 404 uml_reserved = ROUND_4M(brk_start) + (1 << 22);
405 405
406 setup_machinename(system_utsname.machine); 406 setup_machinename(init_utsname()->machine);
407 407
408#ifdef CONFIG_CMDLINE_ON_HOST 408#ifdef CONFIG_CMDLINE_ON_HOST
409 argv1_begin = argv[1]; 409 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)
16 printk("\n"); 16 printk("\n");
17 print_modules(); 17 print_modules();
18 printk("Pid: %d, comm: %.20s %s %s\n", 18 printk("Pid: %d, comm: %.20s %s %s\n",
19 current->pid, current->comm, print_tainted(), system_utsname.release); 19 current->pid, current->comm, print_tainted(), init_utsname()->release);
20 printk("RIP: %04lx:[<%016lx>] ", PT_REGS_CS(regs) & 0xffff, 20 printk("RIP: %04lx:[<%016lx>] ", PT_REGS_CS(regs) & 0xffff,
21 PT_REGS_RIP(regs)); 21 PT_REGS_RIP(regs));
22 printk("\nRSP: %016lx EFLAGS: %08lx\n", PT_REGS_RSP(regs), 22 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)
294 print_modules(); 294 print_modules();
295 printk("Pid: %d, comm: %.20s %s %s %.*s\n", 295 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
296 current->pid, current->comm, print_tainted(), 296 current->pid, current->comm, print_tainted(),
297 system_utsname.release, 297 init_utsname()->release,
298 (int)strcspn(system_utsname.version, " "), 298 (int)strcspn(init_utsname()->version, " "),
299 system_utsname.version); 299 init_utsname()->version);
300 printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip); 300 printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip);
301 printk_address(regs->rip); 301 printk_address(regs->rip);
302 printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->rsp, 302 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)
1601 dev->mmap = ipath_mmap; 1601 dev->mmap = ipath_mmap;
1602 1602
1603 snprintf(dev->node_desc, sizeof(dev->node_desc), 1603 snprintf(dev->node_desc, sizeof(dev->node_desc),
1604 IPATH_IDSTR " %s", system_utsname.nodename); 1604 IPATH_IDSTR " %s", init_utsname()->nodename);
1605 1605
1606 ret = ib_register_device(dev); 1606 ret = ib_register_device(dev);
1607 if (ret) 1607 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)
684 int ret; 684 int ret;
685 685
686 snprintf(lcd_text_default, sizeof(lcd_text_default), 686 snprintf(lcd_text_default, sizeof(lcd_text_default),
687 "Linux %s", system_utsname.release); 687 "Linux %s", init_utsname()->release);
688 688
689 /* Work around the buggy PDC of KittyHawk-machines */ 689 /* Work around the buggy PDC of KittyHawk-machines */
690 switch (CPU_HVERSION) { 690 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)
933 ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size); 933 ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
934 ae->ad.bits.AttrType = be16_to_cpu(OS_NAME_VERSION); 934 ae->ad.bits.AttrType = be16_to_cpu(OS_NAME_VERSION);
935 sprintf(ae->un.OsNameVersion, "%s %s %s", 935 sprintf(ae->un.OsNameVersion, "%s %s %s",
936 system_utsname.sysname, system_utsname.release, 936 init_utsname()->sysname, init_utsname()->release,
937 system_utsname.version); 937 init_utsname()->version);
938 len = strlen(ae->un.OsNameVersion); 938 len = strlen(ae->un.OsNameVersion);
939 len += (len & 3) ? (4 - (len & 3)) : 4; 939 len += (len & 3) ? (4 - (len & 3)) : 4;
940 ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len); 940 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)
1052 size); 1052 size);
1053 ae->ad.bits.AttrType = be16_to_cpu(HOST_NAME); 1053 ae->ad.bits.AttrType = be16_to_cpu(HOST_NAME);
1054 sprintf(ae->un.HostName, "%s", 1054 sprintf(ae->un.HostName, "%s",
1055 system_utsname.nodename); 1055 init_utsname()->nodename);
1056 len = strlen(ae->un.HostName); 1056 len = strlen(ae->un.HostName);
1057 len += (len & 3) ? (4 - (len & 3)) : 4; 1057 len += (len & 3) ? (4 - (len & 3)) : 4;
1058 ae->ad.bits.AttrLen = 1058 ae->ad.bits.AttrLen =
@@ -1140,7 +1140,7 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba)
1140 1140
1141 ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, FDMI_DID); 1141 ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, FDMI_DID);
1142 if (ndlp) { 1142 if (ndlp) {
1143 if (system_utsname.nodename[0] != '\0') { 1143 if (init_utsname()->nodename[0] != '\0') {
1144 lpfc_fdmi_cmd(phba, ndlp, SLI_MGMT_DHBA); 1144 lpfc_fdmi_cmd(phba, ndlp, SLI_MGMT_DHBA);
1145 } else { 1145 } else {
1146 mod_timer(&phba->fc_fdmitmo, jiffies + HZ * 60); 1146 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 (
318 318
319 // id 3 == vendor description 319 // id 3 == vendor description
320 } else if (id == 3) { 320 } else if (id == 3) {
321 snprintf (buf, sizeof buf, "%s %s %s", system_utsname.sysname, 321 snprintf (buf, sizeof buf, "%s %s %s", init_utsname()->sysname,
322 system_utsname.release, hcd->driver->description); 322 init_utsname()->release, hcd->driver->description);
323 323
324 // unsupported IDs --> "protocol stall" 324 // unsupported IDs --> "protocol stall"
325 } else 325 } 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)
2260 return -ENODEV; 2260 return -ENODEV;
2261 } 2261 }
2262 snprintf (manufacturer, sizeof manufacturer, "%s %s/%s", 2262 snprintf (manufacturer, sizeof manufacturer, "%s %s/%s",
2263 system_utsname.sysname, system_utsname.release, 2263 init_utsname()->sysname, init_utsname()->release,
2264 gadget->name); 2264 gadget->name);
2265 2265
2266 /* If there's an RNDIS configuration, that's what Windows wants to 2266 /* 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)
4001 usb_gadget_set_selfpowered(gadget); 4001 usb_gadget_set_selfpowered(gadget);
4002 4002
4003 snprintf(manufacturer, sizeof manufacturer, "%s %s with %s", 4003 snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
4004 system_utsname.sysname, system_utsname.release, 4004 init_utsname()->sysname, init_utsname()->release,
4005 gadget->name); 4005 gadget->name);
4006 4006
4007 /* On a real device, serial[] would be loaded from permanent 4007 /* 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)
1189 strlcpy(manufacturer, iManufacturer, sizeof(manufacturer)); 1189 strlcpy(manufacturer, iManufacturer, sizeof(manufacturer));
1190 } else { 1190 } else {
1191 snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s", 1191 snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
1192 system_utsname.sysname, system_utsname.release, 1192 init_utsname()->sysname, init_utsname()->release,
1193 gadget->name); 1193 gadget->name);
1194 } 1194 }
1195 if (iProduct) { 1195 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)
1434 return -ENOMEM; 1434 return -ENOMEM;
1435 1435
1436 snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s", 1436 snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
1437 system_utsname.sysname, system_utsname.release, 1437 init_utsname()->sysname, init_utsname()->release,
1438 gadget->name); 1438 gadget->name);
1439 1439
1440 memset(dev, 0, sizeof(struct gs_dev)); 1440 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:
1242 EP_OUT_NAME, EP_IN_NAME); 1242 EP_OUT_NAME, EP_IN_NAME);
1243 1243
1244 snprintf (manufacturer, sizeof manufacturer, "%s %s with %s", 1244 snprintf (manufacturer, sizeof manufacturer, "%s %s with %s",
1245 system_utsname.sysname, system_utsname.release, 1245 init_utsname()->sysname, init_utsname()->release,
1246 gadget->name); 1246 gadget->name);
1247 1247
1248 return 0; 1248 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,
111 bytes_ret = cifs_strtoUCS((__le16 *)bcc_ptr, "Linux version ", 32, 111 bytes_ret = cifs_strtoUCS((__le16 *)bcc_ptr, "Linux version ", 32,
112 nls_cp); 112 nls_cp);
113 bcc_ptr += 2 * bytes_ret; 113 bcc_ptr += 2 * bytes_ret;
114 bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release, 114 bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, init_utsname()->release,
115 32, nls_cp); 115 32, nls_cp);
116 bcc_ptr += 2 * bytes_ret; 116 bcc_ptr += 2 * bytes_ret;
117 bcc_ptr += 2; /* trailing null */ 117 bcc_ptr += 2; /* trailing null */
@@ -158,8 +158,8 @@ static void ascii_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
158 158
159 strcpy(bcc_ptr, "Linux version "); 159 strcpy(bcc_ptr, "Linux version ");
160 bcc_ptr += strlen("Linux version "); 160 bcc_ptr += strlen("Linux version ");
161 strcpy(bcc_ptr, system_utsname.release); 161 strcpy(bcc_ptr, init_utsname()->release);
162 bcc_ptr += strlen(system_utsname.release) + 1; 162 bcc_ptr += strlen(init_utsname()->release) + 1;
163 163
164 strcpy(bcc_ptr, CIFS_NETWORK_OPSYS); 164 strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
165 bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1; 165 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)
189 check_fpu(); 189 check_fpu();
190 check_hlt(); 190 check_hlt();
191 check_popad(); 191 check_popad();
192 system_utsname.machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86); 192 init_utsname()->machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
193 alternative_instructions(); 193 alternative_instructions();
194} 194}
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)
18{ 18{
19 extern char *get_cpu_subtype(void); 19 extern char *get_cpu_subtype(void);
20 extern unsigned long loops_per_jiffy; 20 extern unsigned long loops_per_jiffy;
21 char *p= &system_utsname.machine[2]; /* "sh" */ 21 char *p= &init_utsname()->machine[2]; /* "sh" */
22 22
23 cpu_data->loops_per_jiffy = loops_per_jiffy; 23 cpu_data->loops_per_jiffy = loops_per_jiffy;
24 24
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)
518 518
519static void print_kernel_version(void) 519static void print_kernel_version(void)
520{ 520{
521 printk("%s %.*s\n", system_utsname.release, 521 printk("%s %.*s\n", init_utsname()->release,
522 (int)strcspn(system_utsname.version, " "), 522 (int)strcspn(init_utsname()->version, " "),
523 system_utsname.version); 523 init_utsname()->version);
524} 524}
525 525
526/* 526/*
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)
906 memset(info, 0, sizeof(struct swsusp_info)); 906 memset(info, 0, sizeof(struct swsusp_info));
907 info->version_code = LINUX_VERSION_CODE; 907 info->version_code = LINUX_VERSION_CODE;
908 info->num_physpages = num_physpages; 908 info->num_physpages = num_physpages;
909 memcpy(&info->uts, &system_utsname, sizeof(system_utsname)); 909 memcpy(&info->uts, init_utsname(), sizeof(struct new_utsname));
910 info->cpus = num_online_cpus(); 910 info->cpus = num_online_cpus();
911 info->image_pages = nr_copy_pages; 911 info->image_pages = nr_copy_pages;
912 info->pages = nr_copy_pages + nr_meta_pages + 1; 912 info->pages = nr_copy_pages + nr_meta_pages + 1;
@@ -1050,13 +1050,13 @@ static inline int check_header(struct swsusp_info *info)
1050 reason = "kernel version"; 1050 reason = "kernel version";
1051 if (info->num_physpages != num_physpages) 1051 if (info->num_physpages != num_physpages)
1052 reason = "memory size"; 1052 reason = "memory size";
1053 if (strcmp(info->uts.sysname,system_utsname.sysname)) 1053 if (strcmp(info->uts.sysname,init_utsname()->sysname))
1054 reason = "system type"; 1054 reason = "system type";
1055 if (strcmp(info->uts.release,system_utsname.release)) 1055 if (strcmp(info->uts.release,init_utsname()->release))
1056 reason = "kernel release"; 1056 reason = "kernel release";
1057 if (strcmp(info->uts.version,system_utsname.version)) 1057 if (strcmp(info->uts.version,init_utsname()->version))
1058 reason = "version"; 1058 reason = "version";
1059 if (strcmp(info->uts.machine,system_utsname.machine)) 1059 if (strcmp(info->uts.machine,init_utsname()->machine))
1060 reason = "machine"; 1060 reason = "machine";
1061 if (reason) { 1061 if (reason) {
1062 printk(KERN_ERR "swsusp: Resume mismatch: %s\n", reason); 1062 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)
366 */ 366 */
367 367
368 if (!ic_host_name_set) 368 if (!ic_host_name_set)
369 sprintf(system_utsname.nodename, "%u.%u.%u.%u", NIPQUAD(ic_myaddr)); 369 sprintf(init_utsname()->nodename, "%u.%u.%u.%u", NIPQUAD(ic_myaddr));
370 370
371 if (root_server_addr == INADDR_NONE) 371 if (root_server_addr == INADDR_NONE)
372 root_server_addr = ic_servaddr; 372 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,
96{ 96{
97 snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n"); 97 snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n");
98 snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n", 98 snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n",
99 system_utsname.sysname, 99 init_utsname()->sysname,
100 system_utsname.nodename, 100 init_utsname()->nodename,
101 system_utsname.release, 101 init_utsname()->release,
102 system_utsname.version, 102 init_utsname()->version,
103 system_utsname.machine); 103 init_utsname()->machine);
104 snd_iprintf(buffer, "Config options: 0\n"); 104 snd_iprintf(buffer, "Config options: 0\n");
105 snd_iprintf(buffer, "\nInstalled drivers: \n"); 105 snd_iprintf(buffer, "\nInstalled drivers: \n");
106 snd_iprintf(buffer, "Type 10: ALSA emulation\n"); 106 snd_iprintf(buffer, "Type 10: ALSA emulation\n");