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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
powerpc
/
kernel
/
syscalls.c
diff --git
a/arch/powerpc/kernel/syscalls.c
b/arch/powerpc/kernel/syscalls.c
index
7db2919
..
d358866
100644
(file)
--- a/
arch/powerpc/kernel/syscalls.c
+++ b/
arch/powerpc/kernel/syscalls.c
@@
-36,11
+36,11
@@
#include <linux/file.h>
#include <linux/init.h>
#include <linux/personality.h>
#include <linux/file.h>
#include <linux/init.h>
#include <linux/personality.h>
-#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
#include <asm/ipc.h>
#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <asm/ipc.h>
#include <asm/semaphore.h>
+#include <asm/syscalls.h>
#include <asm/time.h>
#include <asm/unistd.h>
#include <asm/time.h>
#include <asm/unistd.h>
@@
-260,7
+260,7
@@
long ppc_newuname(struct new_utsname __user * name)
int err = 0;
down_read(&uts_sem);
int err = 0;
down_read(&uts_sem);
- if (copy_to_user(name,
vx_new_
utsname(), sizeof(*name)))
+ if (copy_to_user(name, utsname(), sizeof(*name)))
err = -EFAULT;
up_read(&uts_sem);
if (!err)
err = -EFAULT;
up_read(&uts_sem);
if (!err)
@@
-273,7
+273,7
@@
int sys_uname(struct old_utsname __user *name)
int err = 0;
down_read(&uts_sem);
int err = 0;
down_read(&uts_sem);
- if (copy_to_user(name,
vx_new_
utsname(), sizeof(*name)))
+ if (copy_to_user(name, utsname(), sizeof(*name)))
err = -EFAULT;
up_read(&uts_sem);
if (!err)
err = -EFAULT;
up_read(&uts_sem);
if (!err)
@@
-284,22
+284,25
@@
int sys_uname(struct old_utsname __user *name)
int sys_olduname(struct oldold_utsname __user *name)
{
int error;
int sys_olduname(struct oldold_utsname __user *name)
{
int error;
- struct new_utsname *ptr;
if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname)))
return -EFAULT;
down_read(&uts_sem);
if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname)))
return -EFAULT;
down_read(&uts_sem);
- ptr = vx_new_utsname();
-
error = __copy_to_user(&name->sysname, ptr->sysname,
__OLD_UTS_LEN);
+ error = __copy_to_user(&name->sysname, &utsname()->sysname,
+
__OLD_UTS_LEN);
error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
- error |= __copy_to_user(&name->nodename, ptr->nodename, __OLD_UTS_LEN);
+ error |= __copy_to_user(&name->nodename, &utsname()->nodename,
+ __OLD_UTS_LEN);
error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
- error |= __copy_to_user(&name->release, ptr->release, __OLD_UTS_LEN);
+ error |= __copy_to_user(&name->release, &utsname()->release,
+ __OLD_UTS_LEN);
error |= __put_user(0, name->release + __OLD_UTS_LEN);
error |= __put_user(0, name->release + __OLD_UTS_LEN);
- error |= __copy_to_user(&name->version, ptr->version, __OLD_UTS_LEN);
+ error |= __copy_to_user(&name->version, &utsname()->version,
+ __OLD_UTS_LEN);
error |= __put_user(0, name->version + __OLD_UTS_LEN);
error |= __put_user(0, name->version + __OLD_UTS_LEN);
- error |= __copy_to_user(&name->machine, ptr->machine, __OLD_UTS_LEN);
+ error |= __copy_to_user(&name->machine, &utsname()->machine,
+ __OLD_UTS_LEN);
error |= override_machine(name->machine);
up_read(&uts_sem);
error |= override_machine(name->machine);
up_read(&uts_sem);