diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-02-14 11:40:55 +0000 |
|---|---|---|
| committer | Jonas Bonn <jonas@southpole.se> | 2012-02-17 09:55:23 +0100 |
| commit | b675eeb743abaa0b99a35c1fd32fea8e13a17d32 (patch) | |
| tree | a852c28da4634204be5e666ad1e0e7118ea7f0b5 /arch | |
| parent | 4ca159f725e46462fbad64c928437a6651f6405b (diff) | |
| download | linux-3.10-b675eeb743abaa0b99a35c1fd32fea8e13a17d32.tar.gz linux-3.10-b675eeb743abaa0b99a35c1fd32fea8e13a17d32.tar.bz2 linux-3.10-b675eeb743abaa0b99a35c1fd32fea8e13a17d32.zip | |
OpenRISC: No need to reset handler if SA_ONESHOT
get_signal_to_deliver() already resets the signal handler if
SA_ONESHOT is set in ka->sa.sa_flags, there's no need to do it again
in handle_signal(). Furthermore, because we were modifying
ka->sa.sa_handler (which is a copy of sighand->action[]) instead of
sighand->action[] the original code actually had no effect on signal
delivery.
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux@lists.openrisc.net
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Jonas Bonn <jonas@southpole.se>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/openrisc/kernel/signal.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c index 53741ba0210..92d2218fcb9 100644 --- a/arch/openrisc/kernel/signal.c +++ b/arch/openrisc/kernel/signal.c @@ -260,9 +260,6 @@ handle_signal(unsigned long sig, { setup_rt_frame(sig, ka, info, oldset, regs); - if (ka->sa.sa_flags & SA_ONESHOT) - ka->sa.sa_handler = SIG_DFL; - spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); if (!(ka->sa.sa_flags & SA_NODEFER)) |