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
..
asm	missing user_stack_pointer() instances	2012-12-19 18:07:39 -05:00
os-Linux	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
shared/sysdep	take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h	2012-11-28 23:43:27 -05:00
vdso
bug.c
bugs_32.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
bugs_64.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
checksum_32.S
delay.c
elfcore.c
fault.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
ksyms.c
ldt.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
Makefile
mem_32.c
mem_64.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
ptrace_32.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
ptrace_64.c
ptrace_user.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
setjmp_32.S
setjmp_64.S
signal.c	new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those	2012-12-19 18:07:41 -05:00
stub_32.S	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
stub_64.S	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
stub_segv.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
sys_call_table_32.c	introduce generic sys_sigaltstack(), switch x86 and um to it	2012-12-19 18:07:40 -05:00
sys_call_table_64.c	introduce generic sys_sigaltstack(), switch x86 and um to it	2012-12-19 18:07:40 -05:00
syscalls_32.c	x86, um: switch to generic fork/vfork/clone	2012-11-28 22:13:44 -05:00
syscalls_64.c	um: kill thread->forking	2012-09-27 18:04:55 +02:00
sysrq_32.c	um: move sysrq.h out of include/shared	2012-10-09 22:28:19 +02:00
sysrq_64.c	um: move sysrq.h out of include/shared	2012-10-09 22:28:19 +02:00
tls_32.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
tls_64.c	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
user-offsets.c