frv: switch to saner kernel_execve() semantics

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

frv: switch to saner kernel_execve() semantics
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
7b7ade11 · Al Viro · e7aa51b2 · 7b7ade11 · 7b7ade11 · 7b7ade11
Commit 7b7ade11 authored 12 years ago by Al Viro
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

arch/frv/Kconfig arch/frv/Kconfig +1 -0

arch/frv/include/asm/unistd.h arch/frv/include/asm/unistd.h +0 -1

arch/frv/kernel/entry.S arch/frv/kernel/entry.S +0 -5

No files found.
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -13,6 +13,7 @@ config FRV
 	select GENERIC_CPU_DEVICES
 	select ARCH_WANT_IPC_PARSE_VERSION
 	select GENERIC_KERNEL_THREAD
+	select GENERIC_KERNEL_EXECVE

 config ZONE_DMA
 	bool

--- a/arch/frv/include/asm/unistd.h
+++ b/arch/frv/include/asm/unistd.h
@@ -30,7 +30,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

--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -869,11 +869,6 @@ ret_from_kernel_thread:
 	call		schedule_tail
 	calll.p		@(gr21,gr0)
 	or		gr20,gr20,gr8
-	bra		sys_exit
-
-	.globl		ret_from_kernel_execve
-ret_from_kernel_execve:
-	ori		gr28,0,sp
 	bra		__syscall_exit

 ###################################################################################################