Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'

[deliverable/linux.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index a4077e90f19fcba4776af7f62a9ed2d4ddb9de03..40b76e351e64aae9cb92039d3d77332afac50d51 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1263,6 +1263,10 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
        struct sighand_struct *sighand;
 
        for (;;) {
+               /*
+                * Disable interrupts early to avoid deadlocks.
+                * See rcu_read_unlock() comment header for details.
+                */
                local_irq_save(*flags);
                rcu_read_lock();
                sighand = rcu_dereference(tsk->sighand);