Merge commit 'e26a9e0' into stable/for-linus-3.15

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

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 1d0848bba049bf2c97bd09d9d86864857af128a7..ca1cd7459c4a3e60c73de7f4169484b03804cdbc 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -465,7 +465,6 @@ static inline void check_stack_overflow(void)
 
 void __do_irq(struct pt_regs *regs)
 {
-       struct irq_desc *desc;
        unsigned int irq;
 
        irq_enter();
@@ -487,11 +486,8 @@ void __do_irq(struct pt_regs *regs)
        /* And finally process it */
        if (unlikely(irq == NO_IRQ))
                __get_cpu_var(irq_stat).spurious_irqs++;
-       else {
-               desc = irq_to_desc(irq);
-               if (likely(desc))
-                       desc->handle_irq(irq, desc);
-       }
+       else
+               generic_handle_irq(irq);
 
        trace_irq_exit(regs);