Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / arch / s390 / kernel / sys_s390.c

diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 584ed95f3380b07b61c151e9616efecf2a218e3c..1c90c7e999782949ddf6efeda76f4c71fbead09e 100644 (file)
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -17,7 +17,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
 #include <linux/shm.h>
@@ -266,23 +265,3 @@ s390_fadvise64_64(struct fadvise64_64_args __user *args)
                return -EFAULT;
        return sys_fadvise64_64(a.fd, a.offset, a.len, a.advice);
 }
-
-/*
- * 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 const char *__arg1 asm("2") = filename;
-       register char *const*__arg2 asm("3") = argv;
-       register char *const*__arg3 asm("4") = envp;
-       register long __svcres asm("2");
-       asm volatile(
-               "svc %b1"
-               : "=d" (__svcres)
-               : "i" (__NR_execve),
-                 "0" (__arg1),
-                 "d" (__arg2),
-                 "d" (__arg3) : "memory");
-       return __svcres;
-}