Merge to Fedora kernel-2.6.6-1.422

[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 a2c5b03..752d840 100644 (file)
--- a/arch/x86_64/kernel/sys_x86_64.c
+++ b/arch/x86_64/kernel/sys_x86_64.c
@@ -25,7 +25,7 @@
  * sys_pipe() is the normal C calling standard for creating
  * a pipe. It's not the way Unix traditionally does this, though.
  */
-asmlinkage long sys_pipe(int __user *fildes)
+asmlinkage long sys_pipe(int *fildes)
 {
        int fd[2];
        int error;
@@ -142,7 +142,7 @@ full_search:
        }
 }
 
-asmlinkage long sys_uname(struct new_utsname __user * name)
+asmlinkage long sys_uname(struct new_utsname * name)
 {
        int err;
        down_read(&uts_sem);
@@ -153,13 +153,13 @@ asmlinkage long sys_uname(struct new_utsname __user * name)
        return err ? -EFAULT : 0;
 }
 
-asmlinkage long wrap_sys_shmat(int shmid, char __user *shmaddr, int shmflg)
+asmlinkage long wrap_sys_shmat(int shmid, char *shmaddr, int shmflg)
 {
        unsigned long raddr;
        return do_shmat(shmid,shmaddr,shmflg,&raddr) ?: (long)raddr;
 }
 
-asmlinkage long sys_time64(long __user * tloc)
+asmlinkage long sys_time64(long * tloc)
 {
        struct timeval now; 
        int i;