Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[karo-tx-linux.git] / kernel / irq / handle.c

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 6ff84e6a954c052ed1f7f483559728a6154647d6..bdb1803255513ee8ee53c3683541348c6c9a4e0b 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -54,14 +54,18 @@ static void warn_no_thread(unsigned int irq, struct irqaction *action)
 static void irq_wake_thread(struct irq_desc *desc, struct irqaction *action)
 {
        /*
-        * Wake up the handler thread for this action. In case the
-        * thread crashed and was killed we just pretend that we
-        * handled the interrupt. The hardirq handler has disabled the
-        * device interrupt, so no irq storm is lurking. If the
+        * In case the thread crashed and was killed we just pretend that
+        * we handled the interrupt. The hardirq handler has disabled the
+        * device interrupt, so no irq storm is lurking.
+        */
+       if (action->thread->flags & PF_EXITING)
+               return;
+
+       /*
+        * Wake up the handler thread for this action. If the
         * RUNTHREAD bit is already set, nothing to do.
         */
-       if ((action->thread->flags & PF_EXITING) ||
-           test_and_set_bit(IRQTF_RUNTHREAD, &action->thread_flags))
+       if (test_and_set_bit(IRQTF_RUNTHREAD, &action->thread_flags))
                return;
 
        /*