diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-22 06:07:08 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:18:52 (GMT) |
| commit | 088b044510c80b43638fc18882defc4e93e06f7d (patch) | |
| tree | f10f78704f133ab78e3b6c90669484d9fc9d8700 /kernel/signal.c | |
| parent | a17deff6a99920caeaf97627463813984bc5dd22 (diff) | |
| download | linux-fsl-qoriq-088b044510c80b43638fc18882defc4e93e06f7d.tar.xz | |
signal-fix-up-rcu-wreckage.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/signal.c')
| -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 e644f50..3d32f54 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1394,12 +1394,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; } @@ -1410,7 +1410,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; |