Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull pile 2 of execve and kernel_thread unification work from Al Viro: "Stuff in there: kernel_thread/kernel_execve/sys_execve conversions for several more architectures plus assorted signal fixes and cleanups. There'll be more (in particular, real fixes for the alpha do_notify_resume() irq mess)..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (43 commits) alpha: don't open-code trace_report_syscall_{enter,exit} Uninclude linux/freezer.h m32r: trim masks avr32: trim masks tile: don't bother with SIGTRAP in setup_frame microblaze: don't bother with SIGTRAP in setup_rt_frame() mn10300: don't bother with SIGTRAP in setup_frame() frv: no need to raise SIGTRAP in setup_frame() x86: get rid of duplicate code in case of CONFIG_VM86 unicore32: remove pointless test h8300: trim _TIF_WORK_MASK parisc: decide whether to go to slow path (tracesys) based on thread flags parisc: don't bother looping in do_signal() parisc: fix double restarts bury the rest of TIF_IRET sanitize tsk_is_polling() bury _TIF_RESTORE_SIGMASK unicore32: unobfuscate _TIF_WORK_MASK mips: NOTIFY_RESUME is not needed in TIF masks mips: merge the identical "return from syscall" per-ABI code ... Conflicts: arch/arm/include/asm/thread_info.h
Showing
- arch/alpha/include/asm/thread_info.h 2 additions, 1 deletionarch/alpha/include/asm/thread_info.h
- arch/alpha/kernel/entry.S 6 additions, 7 deletionsarch/alpha/kernel/entry.S
- arch/alpha/kernel/ptrace.c 13 additions, 19 deletionsarch/alpha/kernel/ptrace.c
- arch/arm/include/asm/thread_info.h 0 additions, 2 deletionsarch/arm/include/asm/thread_info.h
- arch/arm/kernel/signal.c 0 additions, 1 deletionarch/arm/kernel/signal.c
- arch/avr32/include/asm/thread_info.h 6 additions, 12 deletionsarch/avr32/include/asm/thread_info.h
- arch/avr32/kernel/signal.c 0 additions, 1 deletionarch/avr32/kernel/signal.c
- arch/blackfin/include/asm/thread_info.h 0 additions, 4 deletionsarch/blackfin/include/asm/thread_info.h
- arch/blackfin/kernel/signal.c 0 additions, 1 deletionarch/blackfin/kernel/signal.c
- arch/c6x/Kconfig 1 addition, 0 deletionsarch/c6x/Kconfig
- arch/c6x/include/asm/processor.h 0 additions, 2 deletionsarch/c6x/include/asm/processor.h
- arch/c6x/include/asm/syscalls.h 0 additions, 5 deletionsarch/c6x/include/asm/syscalls.h
- arch/c6x/include/asm/thread_info.h 0 additions, 1 deletionarch/c6x/include/asm/thread_info.h
- arch/c6x/include/asm/unistd.h 3 additions, 0 deletionsarch/c6x/include/asm/unistd.h
- arch/c6x/kernel/asm-offsets.c 0 additions, 1 deletionarch/c6x/kernel/asm-offsets.c
- arch/c6x/kernel/entry.S 26 additions, 30 deletionsarch/c6x/kernel/entry.S
- arch/c6x/kernel/process.c 11 additions, 61 deletionsarch/c6x/kernel/process.c
- arch/cris/include/asm/thread_info.h 0 additions, 3 deletionsarch/cris/include/asm/thread_info.h
- arch/frv/Kconfig 1 addition, 0 deletionsarch/frv/Kconfig
- arch/frv/include/asm/processor.h 3 additions, 6 deletionsarch/frv/include/asm/processor.h
Loading
Please register or sign in to comment