Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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"

arch/mips/include/asm/unistd.h

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/mips/kernel/entry.S

+1 −11
Original line number Diff line number Diff line
@@ -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)



/*