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

Merge branches 'no-rebases', 'arch-avr32', 'arch-blackfin', 'arch-cris',... 

Merge branches 'no-rebases', 'arch-avr32', 'arch-blackfin', 'arch-cris', 'arch-h8300', 'arch-m32r', 'arch-mn10300', 'arch-score', 'arch-sh' and 'arch-powerpc' into for-next
parents d2125043 a2b6dfae 5fd0b580 999121a1 1703a219 71915d21 8eae10e8 ddf23e87 1ffbed72 80b249b7 ab75819d

arch/arm64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,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
@@ -128,11 +128,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

+6 −8
Original line number Diff line number Diff line
@@ -23,18 +23,16 @@ 
/*

 * 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,

				  unsigned long tls_val,

				  void __user *child_tid);

asmlinkage long sys_rt_sigreturn_wrapper(void);

asmlinkage long sys_sigaltstack_wrapper(const stack_t __user *uss,

					stack_t __user *uoss);



/*

 * AArch64 sys_clone implementation has a different prototype than the generic

 * one (additional TLS value argument).

 */

#define sys_clone	sys_clone



#include <asm-generic/syscalls.h>



#endif	/* __ASM_SYSCALLS_H */

arch/arm64/include/asm/unistd.h

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

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


__SYSCALL(0,   sys_restart_syscall)

__SYSCALL(1,   sys_exit)

__SYSCALL(2,   compat_sys_fork_wrapper)

__SYSCALL(2,   compat_sys_fork)

__SYSCALL(3,   sys_read)

__SYSCALL(4,   sys_write)

__SYSCALL(5,   compat_sys_open)
@@ -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)
@@ -141,7 +141,7 @@ __SYSCALL(116, compat_sys_sysinfo) 
__SYSCALL(117, sys_ni_syscall)			/* 117 was sys_ipc */

__SYSCALL(118, sys_fsync)

__SYSCALL(119, compat_sys_sigreturn_wrapper)

__SYSCALL(120, compat_sys_clone_wrapper)

__SYSCALL(120, sys_clone)

__SYSCALL(121, sys_setdomainname)

__SYSCALL(122, sys_newuname)

__SYSCALL(123, sys_ni_syscall)			/* 123 was sys_modify_ldt */
@@ -211,7 +211,7 @@ __SYSCALL(186, compat_sys_sigaltstack_wrapper) 
__SYSCALL(187, compat_sys_sendfile)

__SYSCALL(188, sys_ni_syscall)			/* 188 reserved */

__SYSCALL(189, sys_ni_syscall)			/* 189 reserved */

__SYSCALL(190, compat_sys_vfork_wrapper)

__SYSCALL(190, compat_sys_vfork)

__SYSCALL(191, compat_sys_getrlimit)		/* SuS compliant getrlimit */

__SYSCALL(192, sys_mmap_pgoff)

__SYSCALL(193, compat_sys_truncate64_wrapper)