m68k: switch to saner sigsuspend()
PATCH 2/6 m68k: switch to saner sigsuspend()
and saner do_signal() arguments, while we are at it
Signed-off-by Al Viro <[email protected]>
--- arch/m68k/include/asm/thread_info_mm.h | 1 + arch/m68k/include/asm/unistd.h | 1 + arch/m68k/kernel/entry.S | 19 +--------- arch/m68k/kernel/signal.c | 64 ++++++++++--------------------- 4 files changed, 24 insertions(+), 61 deletions(-)
arch/m68k/include/asm/thread_info_mm.h +1 -0
@@ -67,5 +67,6 @@ struct thread_info {#define TIF_SYSCALL_TRACE 15/* syscall trace active */ #define TIF_MEMDIE 16/* is terminating due to OOM killer */ #define TIF_FREEZE 17/* thread is freezing for suspend */ +#define TIF_RESTORE_SIGMASK 18/* restore signal mask in do_signal */ #endif /* _ASM_M68K_THREAD_INFO_H */
arch/m68k/include/asm/unistd.h +1 -0
@@ -373,6 +373,7 @@#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK#define __ARCH_WANT_SYS_RT_SIGACTION +#define __ARCH_WANT_SYS_RT_SIGSUSPEND/* * "Conditional" syscalls
arch/m68k/kernel/entry.S +1 -18
@@ -174,9 +174,8 @@ do_signal_return: subql #4,%sp | dummy return address SAVE_SWITCH_STACK pea %sp@(SWITCH_STACK_SIZE) - clrl %sp@- bsrl do_signal - addql #8,%sp + addql #4,%sp RESTORE_SWITCH_STACK addql #4,%sp tstl %d0
@@ -290,22 +289,6 @@ ENTRY(sys_vfork) RESTORE_SWITCH_STACK rts -ENTRY(sys_sigsuspend) - SAVE_SWITCH_STACK - pea %sp@(SWITCH_STACK_SIZE) - jbsr do_sigsuspend - addql #4,%sp - RESTORE_SWITCH_STACK - rts - -ENTRY(sys_rt_sigsuspend) - SAVE_SWITCH_STACK - pea %sp@(SWITCH_STACK_SIZE) - jbsr do_rt_sigsuspend - addql #4,%sp - RESTORE_SWITCH_STACK - rts - ENTRY(sys_sigreturn) SAVE_SWITCH_STACK jbsr do_sigreturn
arch/m68k/kernel/signal.c +21 -43
106 lines not on this page · raw message
Signature · 1 line
1.5.6.5