diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-21 23:42:15 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 12:58:49 -0400 |
| commit | a610d6e672d6d3723e8da257ad4a8a288a8f2f89 (patch) | |
| tree | 2fac6ce7f72756771f4f87583205cc402589dcad /arch/m68k/kernel | |
| parent | 5754f412a3f107cbcd93ee125bef296f2a07539b (diff) | |
pull clearing RESTORE_SIGMASK into block_sigmask()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/signal.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index c83eb5a8ed8b..6dbee8a167a5 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c | |||
| @@ -1147,8 +1147,6 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
| 1147 | regs->sr &= ~0x8000; | 1147 | regs->sr &= ~0x8000; |
| 1148 | send_sig(SIGTRAP, current, 1); | 1148 | send_sig(SIGTRAP, current, 1); |
| 1149 | } | 1149 | } |
| 1150 | |||
| 1151 | clear_thread_flag(TIF_RESTORE_SIGMASK); | ||
| 1152 | } | 1150 | } |
| 1153 | 1151 | ||
| 1154 | /* | 1152 | /* |