Merge branch 'for_3.8-rc1' into v4l_for_linus

[deliverable/linux.git] / arch / um / kernel / exec.c

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index ab019c7f0b57fdc06f9a70c974d44d80cbd9f1b8..0d7103c9eff3d21c29f15f2f54d5aeabcb0a8449 100644 (file)
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -32,13 +32,14 @@ void flush_thread(void)
                       "err = %d\n", ret);
                force_sig(SIGKILL, current);
        }
+       get_safe_registers(current_pt_regs()->regs.gp,
+                          current_pt_regs()->regs.fp);
 
        __switch_mm(&current->mm->context.id);
 }
 
 void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
 {
-       get_safe_registers(regs->regs.gp, regs->regs.fp);
        PT_REGS_IP(regs) = eip;
        PT_REGS_SP(regs) = esp;
        current->ptrace &= ~PT_DTRACE;
@@ -47,8 +48,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);
-}