Commit fea82210 authored by Al Viro's avatar Al Viro

m68k: switch to saner kernel_execve() semantics

Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ddffeb8c
...@@ -16,6 +16,7 @@ config M68K ...@@ -16,6 +16,7 @@ config M68K
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
select GENERIC_KERNEL_THREAD select GENERIC_KERNEL_THREAD
select GENERIC_KERNEL_EXECVE
select HAVE_MOD_ARCH_SPECIFIC select HAVE_MOD_ARCH_SPECIFIC
select MODULES_USE_ELF_REL select MODULES_USE_ELF_REL
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
......
...@@ -383,7 +383,6 @@ ...@@ -383,7 +383,6 @@
#define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_RT_SIGACTION
#define __ARCH_WANT_SYS_RT_SIGSUSPEND #define __ARCH_WANT_SYS_RT_SIGSUSPEND
#define __ARCH_WANT_SYS_EXECVE #define __ARCH_WANT_SYS_EXECVE
#define __ARCH_WANT_KERNEL_EXECVE
/* /*
* "Conditional" syscalls * "Conditional" syscalls
......
...@@ -115,16 +115,9 @@ ENTRY(ret_from_kernel_thread) ...@@ -115,16 +115,9 @@ ENTRY(ret_from_kernel_thread)
| a3 contains the kernel thread payload, d7 - its argument | a3 contains the kernel thread payload, d7 - its argument
movel %d1,%sp@- movel %d1,%sp@-
jsr schedule_tail jsr schedule_tail
GET_CURRENT(%d0)
movel %d7,(%sp) movel %d7,(%sp)
jsr %a3@ jsr %a3@
addql #4,%sp addql #4,%sp
movel %d0,(%sp)
jra sys_exit
ENTRY(ret_from_kernel_execve)
movel 4(%sp), %sp
GET_CURRENT(%d0)
jra ret_from_exception jra ret_from_exception
#if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU) #if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment