Linus Torvalds 54d46ea993 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal ... Pull signal handling cleanups from Al Viro: "sigaltstack infrastructure + conversion for x86, alpha and um, COMPAT_SYSCALL_DEFINE infrastructure. Note that there are several conflicts between "unify SS_ONSTACK/SS_DISABLE definitions" and UAPI patches in mainline; resolution is trivial - just remove definitions of SS_ONSTACK and SS_DISABLED from arch/*/uapi/asm/signal.h; they are all identical and include/uapi/linux/signal.h contains the unified variant." Fixed up conflicts as per Al. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: alpha: switch to generic sigaltstack new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those generic compat_sys_sigaltstack() introduce generic sys_sigaltstack(), switch x86 and um to it new helper: compat_user_stack_pointer() new helper: restore_altstack() unify SS_ONSTACK/SS_DISABLE definitions new helper: current_user_stack_pointer() missing user_stack_pointer() instances Bury the conditionals from kernel_thread/kernel_execve series COMPAT_SYSCALL_DEFINE: infrastructure		2012-12-20 18:05:28 -08:00
..
byteorder.h	UAPI: (Scripted) Disintegrate arch/openrisc/include/asm	2012-10-09 09:47:18 +01:00
elf.h	UAPI: (Scripted) Disintegrate arch/openrisc/include/asm	2012-10-09 09:47:18 +01:00
Kbuild	UAPI: (Scripted) Disintegrate arch/openrisc/include/asm	2012-10-09 09:47:18 +01:00
param.h	UAPI: (Scripted) Disintegrate arch/openrisc/include/asm	2012-10-09 09:47:18 +01:00
ptrace.h	UAPI: (Scripted) Disintegrate arch/openrisc/include/asm	2012-10-09 09:47:18 +01:00
sigcontext.h	UAPI: (Scripted) Disintegrate arch/openrisc/include/asm	2012-10-09 09:47:18 +01:00
unistd.h	Bury the conditionals from kernel_thread/kernel_execve series	2012-12-19 18:07:38 -05:00