Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / powerpc / kernel / crash.c

diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 4457382f8667a7e770f51c9cb82ee09f9531fb1b..832c8c4db2541225ad007f5592b60ec8fe14776d 100644 (file)
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -414,18 +414,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
        crash_kexec_wait_realmode(crashing_cpu);
 #endif
 
-       for_each_irq(i) {
-               struct irq_desc *desc = irq_to_desc(i);
-
-               if (!desc || !desc->chip || !desc->chip->eoi)
-                       continue;
-
-               if (desc->status & IRQ_INPROGRESS)
-                       desc->chip->eoi(i);
-
-               if (!(desc->status & IRQ_DISABLED))
-                       desc->chip->shutdown(i);
-       }
+       machine_kexec_mask_interrupts();
 
        /*
         * Call registered shutdown routines savely.  Swap out