diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-28 02:04:15 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 12:58:52 -0400 |
commit | efee984c27b67e3ebef40410f35671997441b57c (patch) | |
tree | 53457dba2338f853d34e1754e7f7f960e4a29482 /arch/cris | |
parent | 17440f171e28e86cc21a4c8fd1fa3c561503f80e (diff) |
new helper: signal_delivered()
Does block_sigmask() + tracehook_signal_handler(); called when
sigframe has been successfully built. All architectures converted
to it; block_sigmask() itself is gone now (merged into this one).
I'm still not too happy with the signature, but that's a separate
story (IMO we need a structure that would contain signal number +
siginfo + k_sigaction, so that get_signal_to_deliver() would fill one,
signal_delivered(), handle_signal() and probably setup...frame() -
take one).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/kernel/signal.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index cf6380cb9a57..0bb477c13a4e 100644 --- a/arch/cris/arch-v10/kernel/signal.c +++ b/arch/cris/arch-v10/kernel/signal.c | |||
@@ -453,7 +453,7 @@ static inline void handle_signal(int canrestart, unsigned long sig, | |||
453 | ret = setup_frame(sig, ka, oldset, regs); | 453 | ret = setup_frame(sig, ka, oldset, regs); |
454 | 454 | ||
455 | if (ret == 0) | 455 | if (ret == 0) |
456 | block_sigmask(ka, sig); | 456 | signal_delivered(sig, info, ka, regs, 0); |
457 | } | 457 | } |
458 | 458 | ||
459 | /* | 459 | /* |
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 07b81ee09f65..b60d1b65a426 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
@@ -485,7 +485,7 @@ handle_signal(int canrestart, unsigned long sig, | |||
485 | ret = setup_frame(sig, ka, oldset, regs); | 485 | ret = setup_frame(sig, ka, oldset, regs); |
486 | 486 | ||
487 | if (ret == 0) | 487 | if (ret == 0) |
488 | block_sigmask(ka, sig); | 488 | signal_delivered(sig, info, ka, regs, 0); |
489 | } | 489 | } |
490 | 490 | ||
491 | /* | 491 | /* |