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/i386/kernel/traps.c | |
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/i386/kernel/traps.c')
-rw-r--r-- | arch/i386/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |