Pull cpuidle into release branch

[pandora-kernel.git] / arch / m32r / kernel / sys_m32r.c

diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c
index 7c29396..6d7a80f 100644 (file)
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
@@ -10,8 +10,8 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/fs.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
 #include <linux/shm.h>
@@ -20,16 +20,18 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>
 
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/cacheflush.h>
-#include <asm/ipc.h>
+#include <asm/syscall.h>
+#include <asm/unistd.h>
 
 /*
  * sys_tas() - test-and-set
  */
-asmlinkage int sys_tas(int *addr)
+asmlinkage int sys_tas(int __user *addr)
 {
        int oldval;
 
@@ -88,7 +90,7 @@ sys_pipe(unsigned long r0, unsigned long r1, unsigned long r2,
 
        error = do_pipe(fd);
        if (!error) {
-               if (copy_to_user((void *)r0, (void *)fd, 2*sizeof(int)))
+               if (copy_to_user((void __user *)r0, fd, 2*sizeof(int)))
                        error = -EFAULT;
        }
        return error;
@@ -199,7 +201,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
        }
 }
 
-asmlinkage int sys_uname(struct old_utsname * name)
+asmlinkage int sys_uname(struct old_utsname __user * name)
 {
        int err;
        if (!name)
@@ -212,7 +214,7 @@ asmlinkage int sys_uname(struct old_utsname * name)
 
 asmlinkage int sys_cacheflush(void *addr, int bytes, int cache)
 {
-       /* This should flush more selectivly ...  */
+       /* This should flush more selectively ...  */
        _flush_cache_all();
        return 0;
 }
@@ -223,3 +225,21 @@ asmlinkage int sys_cachectl(char *addr, int nbytes, int op)
        return -ENOSYS;
 }
 
+/*
+ * Do a system call from kernel instead of calling sys_execve so we
+ * end up with proper pt_regs.
+ */
+int kernel_execve(const char *filename, char *const argv[], char *const envp[])
+{
+       register long __scno __asm__ ("r7") = __NR_execve;
+       register long __arg3 __asm__ ("r2") = (long)(envp);
+       register long __arg2 __asm__ ("r1") = (long)(argv);
+       register long __res __asm__ ("r0") = (long)(filename);
+       __asm__ __volatile__ (
+               "trap #" SYSCALL_VECTOR "|| nop"
+               : "=r" (__res)
+               : "r" (__scno), "0" (__res), "r" (__arg2),
+                       "r" (__arg3)
+               : "memory");
+       return __res;
+}