mn10300: switch to saner kernel_execve() semantics

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

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 04669fac117b34b9e35bc73d10428efa45561d36..72471744a9124f36ca33b9f4bbd583fd96f88c2a 100644 (file)
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -9,6 +9,7 @@ config MN10300
        select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
        select GENERIC_CLOCKEVENTS
        select GENERIC_KERNEL_THREAD
+       select GENERIC_KERNEL_EXECVE
        select MODULES_USE_ELF_RELA
 
 config AM33_2

diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index 55bbec1887e980d5036ede2d847a9a607d90198b..9711d51b0212d56d8e594ea7e7fd4d6dbaa8c43f 100644 (file)
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -44,7 +44,6 @@
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_EXECVE
-#define __ARCH_WANT_KERNEL_EXECVE
 
 /*
  * "Conditional" syscalls

diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S
index 0c631d34c8d7f1f73807b4f46c8114ea430a3154..68fcab8f8f6f5eadebd5a18715034d6b33c8d781 100644 (file)
--- a/arch/mn10300/kernel/entry.S
+++ b/arch/mn10300/kernel/entry.S
@@ -60,13 +60,8 @@ ENTRY(ret_from_kernel_thread)
        mov     (REG_D0,fp),d0
        mov     (REG_A0,fp),a0
        calls   (a0)
-       jmp     sys_exit
-
-ENTRY(ret_from_kernel_execve)
-       add     -12,d0  /* pt_regs -> frame */
-       mov     d0,sp
-       GET_THREAD_INFO a2
        clr     d0
+       mov     d0,(REG_D0,fp)
        jmp     syscall_exit
 
 ###############################################################################