projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
m68k
/
kernel
/
signal.c
diff --git
a/arch/m68k/kernel/signal.c
b/arch/m68k/kernel/signal.c
index c00caad215a6f0b00ab9a34f4275ff5052337a10..710a528b928b8580ac4281449586ee4507966db9 100644
(file)
--- a/
arch/m68k/kernel/signal.c
+++ b/
arch/m68k/kernel/signal.c
@@
-1137,7
+1137,7
@@
handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
if (err)
return;
-
block_sigmask(ka, sig
);
+
signal_delivered(sig, info, ka, regs, 0
);
if (test_thread_flag(TIF_DELAYED_TRACE)) {
regs->sr &= ~0x8000;