Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal (42859eea) · Commits · 戴 / test

Pull generic execve() changes from Al Viro: "This introduces the generic kernel_thread() and kernel_execve() functions, and switches x86, arm, alpha, um and s390 over to them." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (26 commits) s390: convert to generic kernel_execve() s390: switch to generic kernel_thread() s390: fold kernel_thread_helper() into ret_from_fork() s390: fold execve_tail() into start_thread(), convert to generic sys_execve() um: switch to generic kernel_thread() x86, um/x86: switch to generic sys_execve and kernel_execve x86: split ret_from_fork alpha: introduce ret_from_kernel_execve(), switch to generic kernel_execve() alpha: switch to generic kernel_thread() alpha: switch to generic sys_execve() arm: get rid of execve wrapper, switch to generic execve() implementation arm: optimized current_pt_regs() arm: introduce ret_from_kernel_execve(), switch to generic kernel_execve() arm: split ret_from_fork, simplify kernel_thread() [based on patch by rmk] generic sys_execve() generic kernel_execve() new helper: current_pt_regs() preparation for generic kernel_thread() um: kill thread->forking um: let signal_delivered() do SIGTRAP on singlestepping into handler ...

arch/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -271,6 +271,9 @@ config ARCH_WANT_OLD_COMPAT_IPC
		select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
		bool

		config GENERIC_KERNEL_THREAD
		bool

		config HAVE_ARCH_SECCOMP_FILTER
		bool
		help

arch/alpha/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ config ALPHA
		select GENERIC_CMOS_UPDATE
		select GENERIC_STRNCPY_FROM_USER
		select GENERIC_STRNLEN_USER
		select GENERIC_KERNEL_THREAD
		help
		The Alpha is a 64-bit general-purpose processor designed and
		marketed by the Digital Equipment Corporation of blessed memory,

arch/alpha/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,3 +10,4 @@ header-y += pal.h
		header-y += reg.h
		header-y += regdef.h
		header-y += sysinfo.h
		generic-y += exec.h

arch/alpha/include/asm/exec.h

deleted100644 → 0

+0 −6

Original line number	Diff line number	Diff line
		#ifndef __ALPHA_EXEC_H
		#define __ALPHA_EXEC_H

		#define arch_align_stack(x) (x)

		#endif /* __ALPHA_EXEC_H */

arch/alpha/include/asm/processor.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -49,9 +49,6 @@ extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
		/* Free all resources held by a thread. */
		extern void release_thread(struct task_struct *);

		/* Create a kernel thread without removing it from tasklists. */
		extern long kernel_thread(int (fn)(void ), void *arg, unsigned long flags);

		unsigned long get_wchan(struct task_struct *p);

		#define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc)

Admin message