powerpc: Correct DSCR during TM context switch

[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..248ee7e5bebdd2736a48b1d164321e51ae0a924e 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -304,7 +304,7 @@ void notrace restore_interrupts(void)
  * being re-enabled and generally sanitized the lazy irq state,
  * and in the latter case it will leave with interrupts hard
  * disabled and marked as such, so the local_irq_enable() call
- * in cpu_idle() will properly re-enable everything.
+ * in arch_cpu_idle() will properly re-enable everything.
  */
 bool prep_irq_for_idle(void)
 {
@@ -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);