diff options
author | Serge E. Hallyn <serue@us.ibm.com> | 2006-10-02 05:18:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 10:57:21 -0400 |
commit | 96b644bdec977b97a45133e5b4466ba47a7a5e65 (patch) | |
tree | 4c6d1f0d54746aa06132628379b2a0efec5e1701 /arch/powerpc | |
parent | e9ff3990f08e9a0c2839cc22808b01732ea5b3e4 (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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 |
3 files changed, 3 insertions, 3 deletions
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 | } |