diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-07-14 15:52:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-15 17:42:24 -0400 |
commit | b5032a50aea76b6230db74b1d171a7f56b204bb7 (patch) | |
tree | 6334709a1ce14ca50fd8a90d94dfac97f8d68edb /arch | |
parent | 6d76fa58b050044994fe25f8753b8023f2b36737 (diff) |
[PATCH] UML - fix utsname build breakage
Some -mm-only material leaked into a patch destined for mainline, and I didn't
notice.
This was the replacement of system_utsname with utsname() that's required by
the uts namespace patch. This patch reverts those changes (which are correct
in -mm) so that mainline UML builds again.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/kernel/syscall.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c index abf14aaf905f..48cf88dd02d4 100644 --- a/arch/um/kernel/syscall.c +++ b/arch/um/kernel/syscall.c | |||
@@ -110,7 +110,7 @@ long sys_uname(struct old_utsname __user * name) | |||
110 | if (!name) | 110 | if (!name) |
111 | return -EFAULT; | 111 | return -EFAULT; |
112 | down_read(&uts_sem); | 112 | down_read(&uts_sem); |
113 | err = copy_to_user(name, utsname(), sizeof (*name)); | 113 | err = copy_to_user(name, &system_utsname, sizeof (*name)); |
114 | up_read(&uts_sem); | 114 | up_read(&uts_sem); |
115 | return err?-EFAULT:0; | 115 | return err?-EFAULT:0; |
116 | } | 116 | } |
@@ -126,21 +126,21 @@ long sys_olduname(struct oldold_utsname __user * name) | |||
126 | 126 | ||
127 | down_read(&uts_sem); | 127 | down_read(&uts_sem); |
128 | 128 | ||
129 | error = __copy_to_user(&name->sysname, &utsname()->sysname, | 129 | error = __copy_to_user(&name->sysname,&system_utsname.sysname, |
130 | __OLD_UTS_LEN); | 130 | __OLD_UTS_LEN); |
131 | error |= __put_user(0, name->sysname + __OLD_UTS_LEN); | 131 | error |= __put_user(0,name->sysname+__OLD_UTS_LEN); |
132 | error |= __copy_to_user(&name->nodename, &utsname()->nodename, | 132 | error |= __copy_to_user(&name->nodename,&system_utsname.nodename, |
133 | __OLD_UTS_LEN); | 133 | __OLD_UTS_LEN); |
134 | error |= __put_user(0, name->nodename + __OLD_UTS_LEN); | 134 | error |= __put_user(0,name->nodename+__OLD_UTS_LEN); |
135 | error |= __copy_to_user(&name->release, &utsname()->release, | 135 | error |= __copy_to_user(&name->release,&system_utsname.release, |
136 | __OLD_UTS_LEN); | 136 | __OLD_UTS_LEN); |
137 | error |= __put_user(0, name->release + __OLD_UTS_LEN); | 137 | error |= __put_user(0,name->release+__OLD_UTS_LEN); |
138 | error |= __copy_to_user(&name->version, &utsname()->version, | 138 | error |= __copy_to_user(&name->version,&system_utsname.version, |
139 | __OLD_UTS_LEN); | 139 | __OLD_UTS_LEN); |
140 | error |= __put_user(0, name->version + __OLD_UTS_LEN); | 140 | error |= __put_user(0,name->version+__OLD_UTS_LEN); |
141 | error |= __copy_to_user(&name->machine, &utsname()->machine, | 141 | error |= __copy_to_user(&name->machine,&system_utsname.machine, |
142 | __OLD_UTS_LEN); | 142 | __OLD_UTS_LEN); |
143 | error |= __put_user(0, name->machine + __OLD_UTS_LEN); | 143 | error |= __put_user(0,name->machine+__OLD_UTS_LEN); |
144 | 144 | ||
145 | up_read(&uts_sem); | 145 | up_read(&uts_sem); |
146 | 146 | ||