3 files changed, 5 insertions, 11 deletions

diff --git a/arch/mn10300/include/asm/frame.inc b/arch/mn10300/include/asm/frame.inc
index 2ee58e3eb6b3..1c3eb4fda958 100644
--- a/arch/mn10300/include/asm/frame.inc
+++ b/arch/mn10300/include/asm/frame.inc
@@ -61,7 +61,7 @@
 ###############################################################################
 .macro RESTORE_ALL
         # peel back the stack to the calling frame
-        # - this permits execve() to discard extra frames due to kernel syscalls
+        # - we need that when returning from interrupts to kernel mode
         GET_THREAD_INFO a0
         mov     (TI_frame,a0),fp
         mov     fp,sp
diff --git a/arch/mn10300/include/asm/processor.h b/arch/mn10300/include/asm/processor.h
index 247928c9f549..0b844a254067 100644
--- a/arch/mn10300/include/asm/processor.h
+++ b/arch/mn10300/include/asm/processor.h
@@ -119,20 +119,13 @@ struct thread_struct {
 
 /*
  * do necessary setup to start up a newly executed thread
- * - need to discard the frame stacked by the kernel thread invoking the execve
- *   syscall (see RESTORE_ALL macro)
  */
 static inline void start_thread(struct pt_regs *regs,
                                 unsigned long new_pc, unsigned long new_sp)
 {
-        struct thread_info *ti = current_thread_info();
-        struct pt_regs *frame0;
-
-        frame0 = thread_info_to_uregs(ti);
-        frame0->epsw = EPSW_nSL | EPSW_IE | EPSW_IM;
-        frame0->pc = new_pc;
-        frame0->sp = new_sp;
-        ti->frame = frame0;
+        regs->epsw = EPSW_nSL | EPSW_IE | EPSW_IM;
+        regs->pc = new_pc;
+        regs->sp = new_sp;
 }
 
 
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index a965de47b2bd..044c770adbb6 100644
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -383,6 +383,7 @@
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_EXECVE
+#define __ARCH_WANT_KERNEL_EXECVE
 
 /*
  * "Conditional" syscalls