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