Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[~andy/linux] / arch / um / kernel / syscall.c

diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index 10808bda36718048f87f5fa1a710e254dbb4495a..a81f3705e90f6e23448ab827c5e980fa8306d9e6 100644 (file)
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -13,7 +13,6 @@
 #include <asm/mman.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
-#include "internal.h"
 
 long sys_fork(void)
 {
@@ -50,19 +49,3 @@ long old_mmap(unsigned long addr, unsigned long len,
  out:
        return err;
 }
-
-int kernel_execve(const char *filename,
-                 const char *const argv[],
-                 const char *const envp[])
-{
-       mm_segment_t fs;
-       int ret;
-
-       fs = get_fs();
-       set_fs(KERNEL_DS);
-       ret = um_execve(filename, (const char __user *const __user *)argv,
-                       (const char __user *const __user *) envp);
-       set_fs(fs);
-
-       return ret;
-}