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

Commit 0cea4793 authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'execve' of... 

Merge branch 'execve' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 into no-rebases
parents 43cc05a6 6a872777

arch/arm64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ config ARM64 
	select GENERIC_IOMAP

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_KERNEL_EXECVE

	select GENERIC_KERNEL_THREAD

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

	select HARDIRQS_SW_RESEND

arch/arm64/include/asm/processor.h

+0 −5
Original line number Diff line number Diff line
@@ -136,11 +136,6 @@ unsigned long get_wchan(struct task_struct *p); 
extern struct task_struct *cpu_switch_to(struct task_struct *prev,

					 struct task_struct *next);



/*

 * Create a new kernel thread

 */

extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);



#define task_pt_regs(p) \

	((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)

arch/arm64/include/asm/syscalls.h

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
/*

 * System call wrappers implemented in kernel/entry.S.

 */

asmlinkage long sys_execve_wrapper(const char __user *filename,

				   const char __user *const __user *argv,

				   const char __user *const __user *envp);

asmlinkage long sys_clone_wrapper(unsigned long clone_flags,

				  unsigned long newsp,

				  void __user *parent_tid,

arch/arm64/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ 
#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND

#define __ARCH_WANT_COMPAT_SYS_SENDFILE

#endif

#define __ARCH_WANT_SYS_EXECVE

#include <uapi/asm/unistd.h>

arch/arm64/include/asm/unistd32.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ __SYSCALL(7, sys_ni_syscall) /* 7 was sys_waitpid */ 
__SYSCALL(8,   sys_creat)

__SYSCALL(9,   sys_link)

__SYSCALL(10,  sys_unlink)

__SYSCALL(11,  compat_sys_execve_wrapper)

__SYSCALL(11,  compat_sys_execve)

__SYSCALL(12,  sys_chdir)

__SYSCALL(13,  sys_ni_syscall)			/* 13 was sys_time */

__SYSCALL(14,  sys_mknod)