diff options
| author | Serge E. Hallyn <serue@us.ibm.com> | 2006-10-02 02:18:13 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 07:57:21 -0700 | 
| commit | 96b644bdec977b97a45133e5b4466ba47a7a5e65 (patch) | |
| tree | 4c6d1f0d54746aa06132628379b2a0efec5e1701 /sound/core/info_oss.c | |
| parent | e9ff3990f08e9a0c2839cc22808b01732ea5b3e4 (diff) | |
| download | olio-linux-3.10-96b644bdec977b97a45133e5b4466ba47a7a5e65.tar.xz olio-linux-3.10-96b644bdec977b97a45133e5b4466ba47a7a5e65.zip  | |
[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/info_oss.c')
| -rw-r--r-- | sound/core/info_oss.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c index 3ebc34919c7..a444bfe2cf7 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,  {  	snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n");  	snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n", -		    system_utsname.sysname, -		    system_utsname.nodename, -		    system_utsname.release, -		    system_utsname.version, -		    system_utsname.machine); +		    init_utsname()->sysname, +		    init_utsname()->nodename, +		    init_utsname()->release, +		    init_utsname()->version, +		    init_utsname()->machine);  	snd_iprintf(buffer, "Config options: 0\n");  	snd_iprintf(buffer, "\nInstalled drivers: \n");  	snd_iprintf(buffer, "Type 10: ALSA emulation\n");  |