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
vserver 1.9.3
[linux-2.6.git]
/
arch
/
mips
/
kernel
/
syscall.c
diff --git
a/arch/mips/kernel/syscall.c
b/arch/mips/kernel/syscall.c
index
7e1eca9
..
bdd7fbb
100644
(file)
--- a/
arch/mips/kernel/syscall.c
+++ b/
arch/mips/kernel/syscall.c
@@
-24,6
+24,7
@@
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>
+#include <linux/vs_cvirt.h>
#include <asm/branch.h>
#include <asm/cachectl.h>
#include <asm/branch.h>
#include <asm/cachectl.h>
@@
-36,7
+37,7
@@
#include <asm/sysmips.h>
#include <asm/uaccess.h>
#include <asm/sysmips.h>
#include <asm/uaccess.h>
-asmlinkage int sys_pipe(nabi_no_regargs struct pt_regs regs)
+asmlinkage int sys_pipe(nabi_no_regargs
volatile
struct pt_regs regs)
{
int fd[2];
int error, res;
{
int fd[2];
int error, res;
@@
-180,7
+181,7
@@
static_unused int _sys_clone(nabi_no_regargs struct pt_regs regs)
newsp = regs.regs[29];
parent_tidptr = (int *) regs.regs[6];
child_tidptr = (int *) regs.regs[7];
newsp = regs.regs[29];
parent_tidptr = (int *) regs.regs[6];
child_tidptr = (int *) regs.regs[7];
- return do_fork(clone_flags
& ~CLONE_IDLETASK
, newsp, ®s, 0,
+ return do_fork(clone_flags, newsp, ®s, 0,
parent_tidptr, child_tidptr);
}
parent_tidptr, child_tidptr);
}
@@
-209,7
+210,7
@@
out:
*/
asmlinkage int sys_uname(struct old_utsname * name)
{
*/
asmlinkage int sys_uname(struct old_utsname * name)
{
- if (name && !copy_to_user(name,
&system_utsname
, sizeof (*name)))
+ if (name && !copy_to_user(name,
vx_new_utsname()
, sizeof (*name)))
return 0;
return -EFAULT;
}
return 0;
return -EFAULT;
}
@@
-220,21
+221,23
@@
asmlinkage int sys_uname(struct old_utsname * name)
asmlinkage int sys_olduname(struct oldold_utsname * name)
{
int error;
asmlinkage int sys_olduname(struct oldold_utsname * name)
{
int error;
+ struct new_utsname *ptr;
if (!name)
return -EFAULT;
if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
return -EFAULT;
if (!name)
return -EFAULT;
if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
return -EFAULT;
- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
+ ptr = vx_new_utsname();
+ error = __copy_to_user(&name->sysname,ptr->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,
&system_utsname.
nodename,__OLD_UTS_LEN);
+ error -= __copy_to_user(&name->nodename,
ptr->
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,
&system_utsname.
release,__OLD_UTS_LEN);
+ error -= __copy_to_user(&name->release,
ptr->
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,
&system_utsname.
version,__OLD_UTS_LEN);
+ error -= __copy_to_user(&name->version,
ptr->
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,
&system_utsname.
machine,__OLD_UTS_LEN);
+ error -= __copy_to_user(&name->machine,
ptr->
machine,__OLD_UTS_LEN);
error = __put_user(0,name->machine+__OLD_UTS_LEN);
error = error ? -EFAULT : 0;
error = __put_user(0,name->machine+__OLD_UTS_LEN);
error = error ? -EFAULT : 0;
@@
-260,10
+263,10
@@
asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
return -EFAULT;
down_write(&uts_sem);
return -EFAULT;
down_write(&uts_sem);
- strncpy(
system_utsname.nodename
, nodename, len);
+ strncpy(
vx_new_uts(nodename)
, nodename, len);
nodename[__NEW_UTS_LEN] = '\0';
nodename[__NEW_UTS_LEN] = '\0';
- strlcpy(
system_utsname.nodename
, nodename,
- sizeof(
system_utsname.nodename
));
+ strlcpy(
vx_new_uts(nodename)
, nodename,
+ sizeof(
vx_new_uts(nodename)
));
up_write(&uts_sem);
return 0;
}
up_write(&uts_sem);
return 0;
}