This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / kernel / syscalls.c

diff --git a/arch/ppc/kernel/syscalls.c b/arch/ppc/kernel/syscalls.c
index 6d1c9c4..d33e635 100644 (file)
--- a/arch/ppc/kernel/syscalls.c
+++ b/arch/ppc/kernel/syscalls.c
@@ -67,7 +67,7 @@ sys_ipc (uint call, int first, int second, int third, void __user *ptr, long fif
                break;
        case SEMTIMEDOP:
                ret = sys_semtimedop (first, (struct sembuf __user *)ptr,
-                                     second, (const struct timespec __user *) fifth);
+                                     second, (const struct timespec *) fifth);
                break;
        case SEMGET:
                ret = sys_semget (first, second, third);
@@ -78,7 +78,7 @@ sys_ipc (uint call, int first, int second, int third, void __user *ptr, long fif
                if (!ptr)
                        break;
                if ((ret = verify_area (VERIFY_READ, ptr, sizeof(long)))
-                   || (ret = get_user(fourth.__pad, (void __user *__user *)ptr)))
+                   || (ret = get_user(fourth.__pad, (void *__user *)ptr)))
                        break;
                ret = sys_semctl (first, second, third, fourth);
                break;
@@ -208,17 +208,17 @@ out:
  * sys_select() with the appropriate args. -- Cort
  */
 int
-ppc_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, struct timeval __user *tvp)
+ppc_select(int n, fd_set *inp, fd_set *outp, fd_set *exp, struct timeval *tvp)
 {
        if ( (unsigned long)n >= 4096 )
        {
                unsigned long __user *buffer = (unsigned long __user *)n;
                if (verify_area(VERIFY_READ, buffer, 5*sizeof(unsigned long))
                    || __get_user(n, buffer)
-                   || __get_user(inp, ((fd_set __user * __user *)(buffer+1)))
-                   || __get_user(outp, ((fd_set  __user * __user *)(buffer+2)))
-                   || __get_user(exp, ((fd_set  __user * __user *)(buffer+3)))
-                   || __get_user(tvp, ((struct timeval  __user * __user *)(buffer+4))))
+                   || __get_user(inp, ((fd_set **)(buffer+1)))
+                   || __get_user(outp, ((fd_set **)(buffer+2)))
+                   || __get_user(exp, ((fd_set **)(buffer+3)))
+                   || __get_user(tvp, ((struct timeval **)(buffer+4))))
                        return -EFAULT;
        }
        return sys_select(n, inp, outp, exp, tvp);
@@ -229,7 +229,7 @@ int sys_uname(struct old_utsname __user * name)
        int err = -EFAULT;
 
        down_read(&uts_sem);
-       if (name && !copy_to_user(name, &system_utsname, sizeof (*name)))
+       if (name && !copy_to_user(name, vx_new_utsname(), sizeof (*name)))
                err = 0;
        up_read(&uts_sem);
        return err;
@@ -238,6 +238,7 @@ int sys_uname(struct old_utsname __user * name)
 int sys_olduname(struct oldold_utsname __user * name)
 {
        int error;
+       struct new_utsname *ptr;
 
        if (!name)
                return -EFAULT;
@@ -245,15 +246,16 @@ int sys_olduname(struct oldold_utsname __user * name)
                return -EFAULT;
 
        down_read(&uts_sem);
-       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 -= __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 -= __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 -= __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 -= __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);
        up_read(&uts_sem);