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/sh/kernel/setup.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/sh/kernel/setup.c')
-rw-r--r-- | arch/sh/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |