git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
sys_x86_64.c
diff --git
a/arch/x86_64/kernel/sys_x86_64.c
b/arch/x86_64/kernel/sys_x86_64.c
index
142fbf7
..
76bf7c2
100644
(file)
--- a/
arch/x86_64/kernel/sys_x86_64.c
+++ b/
arch/x86_64/kernel/sys_x86_64.c
@@
-16,7
+16,6
@@
#include <linux/file.h>
#include <linux/utsname.h>
#include <linux/personality.h>
#include <linux/file.h>
#include <linux/utsname.h>
#include <linux/personality.h>
-#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
#include <asm/ia32.h>
#include <asm/uaccess.h>
#include <asm/ia32.h>
@@
-149,7
+148,7
@@
asmlinkage long sys_uname(struct new_utsname __user * name)
{
int err;
down_read(&uts_sem);
{
int err;
down_read(&uts_sem);
- err = copy_to_user(name,
vx_new_
utsname(), sizeof (*name));
+ err = copy_to_user(name, utsname(), sizeof (*name));
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);