x86, um: convert to saner kernel_execve() semantics

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 3 insertions, 12 deletions

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index e427301f55d..565ca396d83 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -47,8 +47,3 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
 #endif
 }
 EXPORT_SYMBOL(start_thread);
-
-void __noreturn ret_from_kernel_execve(struct pt_regs *unused)
-{
-        UML_LONGJMP(current->thread.exec_buf, 1);
-}
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index a1b50add48a..94b0d8b9810 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -135,14 +135,10 @@ void new_thread_handler(void)
         arg = current->thread.request.u.thread.arg;
 
         /*
-         * The return value is 1 if the kernel thread execs a process,
-         * 0 if it just exits
+         * callback returns only if the kernel thread execs a process
          */
-        n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
-        if (n == 1)
-                userspace(&current->thread.regs.regs);
-        else
-                do_exit(0);
+        n = fn(arg);
+        userspace(&current->thread.regs.regs);
 }
 
 /* Called magically, see new_thread_handler above */