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
Showing
- arch/Kconfig 3 additions, 6 deletionsarch/Kconfig
- arch/alpha/Kconfig 1 addition, 2 deletionsarch/alpha/Kconfig
- arch/alpha/include/asm/ptrace.h 1 addition, 0 deletionsarch/alpha/include/asm/ptrace.h
- arch/alpha/include/asm/unistd.h 0 additions, 1 deletionarch/alpha/include/asm/unistd.h
- arch/alpha/include/uapi/asm/signal.h 0 additions, 6 deletionsarch/alpha/include/uapi/asm/signal.h
- arch/alpha/kernel/signal.c 1 addition, 9 deletionsarch/alpha/kernel/signal.c
- arch/arm/Kconfig 0 additions, 2 deletionsarch/arm/Kconfig
- arch/arm/include/asm/unistd.h 0 additions, 1 deletionarch/arm/include/asm/unistd.h
- arch/arm/include/uapi/asm/signal.h 0 additions, 7 deletionsarch/arm/include/uapi/asm/signal.h
- arch/arm64/Kconfig 0 additions, 2 deletionsarch/arm64/Kconfig
- arch/arm64/include/asm/compat.h 3 additions, 2 deletionsarch/arm64/include/asm/compat.h
- arch/arm64/include/asm/unistd.h 0 additions, 1 deletionarch/arm64/include/asm/unistd.h
- arch/avr32/Kconfig 0 additions, 2 deletionsarch/avr32/Kconfig
- arch/avr32/include/asm/ptrace.h 1 addition, 0 deletionsarch/avr32/include/asm/ptrace.h
- arch/avr32/include/asm/unistd.h 0 additions, 1 deletionarch/avr32/include/asm/unistd.h
- arch/avr32/include/uapi/asm/signal.h 0 additions, 6 deletionsarch/avr32/include/uapi/asm/signal.h
- arch/blackfin/Kconfig 0 additions, 2 deletionsarch/blackfin/Kconfig
- arch/blackfin/include/asm/ptrace.h 1 addition, 0 deletionsarch/blackfin/include/asm/ptrace.h
- arch/blackfin/include/asm/unistd.h 0 additions, 1 deletionarch/blackfin/include/asm/unistd.h
- arch/c6x/Kconfig 0 additions, 2 deletionsarch/c6x/Kconfig
Loading
Please register or sign in to comment