Commit 9b0e5d42 authored by Al Viro's avatar Al Viro

mips: switch to saner kernel_execve() semantics

Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent baf9ff74
...@@ -41,6 +41,7 @@ config MIPS ...@@ -41,6 +41,7 @@ config MIPS
select MODULES_USE_ELF_REL select MODULES_USE_ELF_REL
select MODULES_USE_ELF_RELA if 64BIT select MODULES_USE_ELF_RELA if 64BIT
select GENERIC_KERNEL_THREAD select GENERIC_KERNEL_THREAD
select GENERIC_KERNEL_EXECVE
menu "Machine selection" menu "Machine selection"
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#define __ARCH_OMIT_COMPAT_SYS_GETDENTS64 #define __ARCH_OMIT_COMPAT_SYS_GETDENTS64
#define __ARCH_WANT_KERNEL_EXECVE
#define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_SYS_ALARM #define __ARCH_WANT_SYS_ALARM
#define __ARCH_WANT_SYS_EXECVE #define __ARCH_WANT_SYS_EXECVE
......
...@@ -69,8 +69,7 @@ FEXPORT(ret_from_kernel_thread) ...@@ -69,8 +69,7 @@ FEXPORT(ret_from_kernel_thread)
jal schedule_tail # a0 = struct task_struct *prev jal schedule_tail # a0 = struct task_struct *prev
move a0, s1 move a0, s1
jal s0 jal s0
li a0, 0 j syscall_exit
j sys_exit
FEXPORT(ret_from_fork) FEXPORT(ret_from_fork)
jal schedule_tail # a0 = struct task_struct *prev jal schedule_tail # a0 = struct task_struct *prev
...@@ -192,15 +191,6 @@ syscall_exit_work: ...@@ -192,15 +191,6 @@ syscall_exit_work:
jal syscall_trace_leave jal syscall_trace_leave
b resume_userspace b resume_userspace
LEAF(ret_from_kernel_execve)
move sp, a0
ori $28, sp, _THREAD_SIZE - 1
xori $28, $28, _THREAD_SIZE - 1
li v0, 0
li a3, 0
j syscall_exit_partial
END(ret_from_kernel_execve)
#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_MIPS_MT) #if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_MIPS_MT)
/* /*
......
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