diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-22 08:07:08 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-15 10:32:39 -0600 |
| commit | ee1ee0c47a5f3ce9bed87f69fb48b00c1653d9ef (patch) | |
| tree | 80ed96857804c788a63fda03544c6cfea9bded3e /kernel | |
| parent | cb6cf87c1213d8b17977a852987c32d4e851469c (diff) | |
signal-fix-up-rcu-wreckage.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/signal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index c8b1bc1d668d..739c2e40d982 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1362,12 +1362,12 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk, struct sighand_struct *sighand; for (;;) { - local_irq_save(*flags); + local_irq_save_nort(*flags); rcu_read_lock(); sighand = rcu_dereference(tsk->sighand); if (unlikely(sighand == NULL)) { rcu_read_unlock(); - local_irq_restore(*flags); + local_irq_restore_nort(*flags); break; } @@ -1378,7 +1378,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk, } spin_unlock(&sighand->siglock); rcu_read_unlock(); - local_irq_restore(*flags); + local_irq_restore_nort(*flags); } return sighand; |