| From 9bfe2888ce21033067e3b8ada6e46e11a4bff2fb Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 22 Jul 2011 08:07:08 +0200 |
| Subject: [PATCH 074/274] signal-fix-up-rcu-wreckage.patch |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| kernel/signal.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/kernel/signal.c b/kernel/signal.c |
| index 65cb5b4..3d32651 100644 |
| --- a/kernel/signal.c |
| +++ b/kernel/signal.c |
| @@ -1401,12 +1401,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; |
| } |
| |
| @@ -1417,7 +1417,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; |
| -- |
| 1.7.10.4 |
| |