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

Commit 39fcf440 authored by Mark Salter's avatar Mark Salter Committed by Al Viro
Browse files

c6x: switch to generic kernel_execve 



Signed-off-by: default avatarMark Salter <msalter@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 46f15067

arch/c6x/include/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#if !defined(_ASM_C6X_UNISTD_H) || defined(__SYSCALL)

#define _ASM_C6X_UNISTD_H



#define __ARCH_WANT_KERNEL_EXECVE



/* Use the standard ABI for syscalls. */

#include <asm-generic/unistd.h>

arch/c6x/kernel/entry.S

+6 −7
Original line number Diff line number Diff line
@@ -420,6 +420,12 @@ ENTRY(ret_from_kernel_thread) 
	BNOP	.S2	B11,5	/* jump to sys_exit */

ENDPROC(ret_from_kernel_thread)



ENTRY(ret_from_kernel_execve)

	GET_THREAD_INFO A12

	BNOP	.S2	syscall_exit,4

	ADD	.D2X	A4,-8,SP

ENDPROC(ret_from_kernel_execve)



	;;

	;; These are the interrupt handlers, responsible for calling __do_IRQ()

	;; int6 is used for syscalls (see _system_call entry)
@@ -613,13 +619,6 @@ ENTRY(sys_sigaltstack) 
	NOP	4

ENDPROC(sys_sigaltstack)



	;; kernel_execve

ENTRY(kernel_execve)

	MVK	.S2	__NR_execve,B0

	SWE

	BNOP	.S2	B3,5

ENDPROC(kernel_execve)



	;;

	;; Special system calls

	;; return address is in B3