Commit ddf23e87 authored by Al Viro's avatar Al Viro
Browse files

mn10300: switch to saner kernel_execve() semantics 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ddffeb8c

arch/mn10300/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ config MN10300 
	select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER

	select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select GENERIC_KERNEL_THREAD

	select GENERIC_KERNEL_THREAD

	select GENERIC_KERNEL_EXECVE

	select MODULES_USE_ELF_RELA

	select MODULES_USE_ELF_RELA





config AM33_2

config AM33_2

arch/mn10300/include/asm/unistd.h

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

arch/mn10300/kernel/entry.S

+1 −6
Original line number Original line Diff line number Diff line
@@ -60,13 +60,8 @@ ENTRY(ret_from_kernel_thread) 
	mov	(REG_D0,fp),d0

	mov	(REG_D0,fp),d0

	mov	(REG_A0,fp),a0

	mov	(REG_A0,fp),a0

	calls	(a0)

	calls	(a0)

	jmp	sys_exit



ENTRY(ret_from_kernel_execve)

	add	-12,d0	/* pt_regs -> frame */

	mov	d0,sp

	GET_THREAD_INFO a2

	clr	d0

	clr	d0

	mov	d0,(REG_D0,fp)

	jmp	syscall_exit

	jmp	syscall_exit





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

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