vserver 1.9.3

[linux-2.6.git] / arch / ppc64 / kernel / sys_ppc32.c

diff --git a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
index 376dc4a..2ac5c7d 100644 (file)
--- a/arch/ppc64/kernel/sys_ppc32.c
+++ b/arch/ppc64/kernel/sys_ppc32.c
@@ -73,7 +73,6 @@
 #include <asm/semaphore.h>
 #include <asm/ppcdebug.h>
 #include <asm/time.h>
-#include <asm/ppc32.h>
 #include <asm/mmu_context.h>
 
 #include "pci.h"
@@ -635,8 +634,24 @@ out:
 void start_thread32(struct pt_regs* regs, unsigned long nip, unsigned long sp)
 {
        set_fs(USER_DS);
-       memset(regs->gpr, 0, sizeof(regs->gpr));
-       memset(&regs->ctr, 0, 4 * sizeof(regs->ctr));
+
+       /*
+        * If we exec out of a kernel thread then thread.regs will not be
+        * set. Do it now.
+        */
+       if (!current->thread.regs) {
+               unsigned long childregs = (unsigned long)current->thread_info +
+                                               THREAD_SIZE;
+               childregs -= sizeof(struct pt_regs);
+               current->thread.regs = (struct pt_regs *)childregs;
+       }
+
+       /*
+        * ELF_PLAT_INIT already clears all registers but it also sets r2.
+        * So just clear r2 here.
+        */
+       regs->gpr[2] = 0;
+
        regs->nip = nip;
        regs->gpr[1] = sp;
        regs->msr = MSR_USER32;
@@ -701,7 +716,7 @@ asmlinkage int sys32_pciconfig_read(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf
                                  (unsigned long) dfn,
                                  (unsigned long) off,
                                  (unsigned long) len,
-                                 (unsigned char __user *)AA(ubuf));
+                                 compat_ptr(ubuf));
 }
 
 asmlinkage int sys32_pciconfig_write(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf)
@@ -710,7 +725,7 @@ asmlinkage int sys32_pciconfig_write(u32 bus, u32 dfn, u32 off, u32 len, u32 ubu
                                   (unsigned long) dfn,
                                   (unsigned long) off,
                                   (unsigned long) len,
-                                  (unsigned char __user *)AA(ubuf));
+                                  compat_ptr(ubuf));
 }
 
 #define IOBASE_BRIDGE_NUMBER   0
@@ -1096,7 +1111,7 @@ struct __sysctl_args32 {
        u32 __unused[4];
 };
 
-extern asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args)
+asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args)
 {
        struct __sysctl_args32 tmp;
        int error;
@@ -1115,19 +1130,20 @@ extern asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args)
                   glibc's __sysctl uses rw memory for the structure
                   anyway.  */
                oldlenp = (size_t __user *)addr;
-               if (get_user(oldlen, (u32 __user *)A(tmp.oldlenp)) ||
+               if (get_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)) ||
                    put_user(oldlen, oldlenp))
                        return -EFAULT;
        }
 
        lock_kernel();
-       error = do_sysctl((int __user *)A(tmp.name), tmp.nlen, (void __user *)A(tmp.oldval),
-                         oldlenp, (void __user *)A(tmp.newval), tmp.newlen);
+       error = do_sysctl(compat_ptr(tmp.name), tmp.nlen,
+                         compat_ptr(tmp.oldval), oldlenp,
+                         compat_ptr(tmp.newval), tmp.newlen);
        unlock_kernel();
        if (oldlenp) {
                if (!error) {
                        if (get_user(oldlen, oldlenp) ||
-                           put_user(oldlen, (u32 __user *)A(tmp.oldlenp)))
+                           put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)))
                                error = -EFAULT;
                }
                copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused));