Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[sfrench/cifs-2.6.git] / arch / s390 / kernel / sys_s390.c

diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index e351780bb660cab9ef1dbc503799969edb175eb1..584ed95f3380b07b61c151e9616efecf2a218e3c 100644 (file)
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -27,6 +27,7 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/personality.h>
+#include <linux/unistd.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
@@ -266,3 +267,22 @@ s390_fadvise64_64(struct fadvise64_64_args __user *args)
        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;
+}