diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-30 12:30:09 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-30 12:30:09 -0400 |
| commit | 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 (patch) | |
| tree | eab3d229c7a527816db405299ce9603e538b521f /arch/cris | |
| parent | e438befd76a5a743725a89365140a8a7bf276096 (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v10/kernel/signal.c | 11 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index 85e0032e664f..693771961f85 100644 --- a/arch/cris/arch-v10/kernel/signal.c +++ b/arch/cris/arch-v10/kernel/signal.c | |||
| @@ -517,13 +517,12 @@ handle_signal(int canrestart, unsigned long sig, | |||
| 517 | if (ka->sa.sa_flags & SA_ONESHOT) | 517 | if (ka->sa.sa_flags & SA_ONESHOT) |
| 518 | ka->sa.sa_handler = SIG_DFL; | 518 | ka->sa.sa_handler = SIG_DFL; |
| 519 | 519 | ||
| 520 | if (!(ka->sa.sa_flags & SA_NODEFER)) { | 520 | spin_lock_irq(¤t->sighand->siglock); |
| 521 | spin_lock_irq(¤t->sighand->siglock); | 521 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); |
| 522 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 522 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
| 523 | sigaddset(¤t->blocked,sig); | 523 | sigaddset(¤t->blocked,sig); |
| 524 | recalc_sigpending(); | 524 | recalc_sigpending(); |
| 525 | spin_unlock_irq(¤t->sighand->siglock); | 525 | spin_unlock_irq(¤t->sighand->siglock); |
| 526 | } | ||
| 527 | } | 526 | } |
| 528 | 527 | ||
| 529 | /* | 528 | /* |
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index fb4c79d5b76b..0a3614dab887 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
| @@ -568,13 +568,12 @@ handle_signal(int canrestart, unsigned long sig, | |||
| 568 | if (ka->sa.sa_flags & SA_ONESHOT) | 568 | if (ka->sa.sa_flags & SA_ONESHOT) |
| 569 | ka->sa.sa_handler = SIG_DFL; | 569 | ka->sa.sa_handler = SIG_DFL; |
| 570 | 570 | ||
| 571 | if (!(ka->sa.sa_flags & SA_NODEFER)) { | 571 | spin_lock_irq(¤t->sighand->siglock); |
| 572 | spin_lock_irq(¤t->sighand->siglock); | 572 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); |
| 573 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 573 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
| 574 | sigaddset(¤t->blocked,sig); | 574 | sigaddset(¤t->blocked,sig); |
| 575 | recalc_sigpending(); | 575 | recalc_sigpending(); |
| 576 | spin_unlock_irq(¤t->sighand->siglock); | 576 | spin_unlock_irq(¤t->sighand->siglock); |
| 577 | } | ||
| 578 | } | 577 | } |
| 579 | 578 | ||
| 580 | /* | 579 | /* |