Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Jeff Dike
and committed by
Linus Torvalds
b5032a50
6d76fa58
+11
-11
+11
-11
arch/um/kernel/syscall.c
+11
-11
arch/um/kernel/syscall.c
···
110
110
if (!name)
111
111
return -EFAULT;
112
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
114
up_read(&uts_sem);
115
115
return err?-EFAULT:0;
116
116
}
···
126
126
127
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
130
__OLD_UTS_LEN);
131
-
error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
132
-
error |= __copy_to_user(&name->nodename, &utsname()->nodename,
131
+
error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
132
+
error |= __copy_to_user(&name->nodename,&system_utsname.nodename,
133
133
__OLD_UTS_LEN);
134
-
error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
135
-
error |= __copy_to_user(&name->release, &utsname()->release,
134
+
error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
135
+
error |= __copy_to_user(&name->release,&system_utsname.release,
136
136
__OLD_UTS_LEN);
137
-
error |= __put_user(0, name->release + __OLD_UTS_LEN);
138
-
error |= __copy_to_user(&name->version, &utsname()->version,
137
+
error |= __put_user(0,name->release+__OLD_UTS_LEN);
138
+
error |= __copy_to_user(&name->version,&system_utsname.version,
139
139
__OLD_UTS_LEN);
140
-
error |= __put_user(0, name->version + __OLD_UTS_LEN);
141
-
error |= __copy_to_user(&name->machine, &utsname()->machine,
140
+
error |= __put_user(0,name->version+__OLD_UTS_LEN);
141
+
error |= __copy_to_user(&name->machine,&system_utsname.machine,
142
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
145
up_read(&uts_sem);
146
146