aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
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 /sound/core
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>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/info_oss.c10
1 files changed, 5 insertions, 5 deletions
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");