浏览代码

mips: switch to saner kernel_execve() semantics

Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 12 年之前
父节点
当前提交
9b0e5d42d9
共有 3 个文件被更改,包括 2 次插入12 次删除
  1. 1 0
      arch/mips/Kconfig
  2. 0 1
      arch/mips/include/asm/unistd.h
  3. 1 11
      arch/mips/kernel/entry.S

+ 1 - 0
arch/mips/Kconfig

@@ -41,6 +41,7 @@ config MIPS
 	select MODULES_USE_ELF_REL
 	select MODULES_USE_ELF_RELA if 64BIT
 	select GENERIC_KERNEL_THREAD
+	select GENERIC_KERNEL_EXECVE
 
 menu "Machine selection"
 

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

@@ -18,7 +18,6 @@
 #ifndef __ASSEMBLY__
 
 #define __ARCH_OMIT_COMPAT_SYS_GETDENTS64
-#define __ARCH_WANT_KERNEL_EXECVE
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_SYS_ALARM
 #define __ARCH_WANT_SYS_EXECVE

+ 1 - 11
arch/mips/kernel/entry.S

@@ -69,8 +69,7 @@ FEXPORT(ret_from_kernel_thread)
 	jal	schedule_tail		# a0 = struct task_struct *prev
 	move	a0, s1
 	jal	s0
-	li	a0, 0
-	j	sys_exit
+	j	syscall_exit
 
 FEXPORT(ret_from_fork)
 	jal	schedule_tail		# a0 = struct task_struct *prev
@@ -192,15 +191,6 @@ syscall_exit_work:
 	jal	syscall_trace_leave
 	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)
 
 /*