1 files changed, 35 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index dd6c141f1662..7ee50f0547cb 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -14,16 +14,41 @@
 #include <linux/threads.h>
 #include <linux/memblock.h>
 #include <linux/of.h>
+#include <linux/irq.h>
+#include <linux/ftrace.h>
+
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/sections.h>
 
+void machine_kexec_mask_interrupts(void) {
+        unsigned int i;
+
+        for_each_irq(i) {
+                struct irq_desc *desc = irq_to_desc(i);
+                struct irq_chip *chip;
+
+                if (!desc)
+                        continue;
+
+                chip = irq_desc_get_chip(desc);
+                if (!chip)
+                        continue;
+
+                if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data))
+                        chip->irq_eoi(&desc->irq_data);
+
+                if (chip->irq_mask)
+                        chip->irq_mask(&desc->irq_data);
+
+                if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))
+                        chip->irq_disable(&desc->irq_data);
+        }
+}
+
 void machine_crash_shutdown(struct pt_regs *regs)
 {
-        if (ppc_md.machine_crash_shutdown)
-                ppc_md.machine_crash_shutdown(regs);
-        else
-                default_machine_crash_shutdown(regs);
+        default_machine_crash_shutdown(regs);
 }
 
 /*
@@ -41,8 +66,6 @@ int machine_kexec_prepare(struct kimage *image)
 
 void machine_kexec_cleanup(struct kimage *image)
 {
-        if (ppc_md.machine_kexec_cleanup)
-                ppc_md.machine_kexec_cleanup(image);
 }
 
 void arch_crash_save_vmcoreinfo(void)
@@ -63,11 +86,17 @@ void arch_crash_save_vmcoreinfo(void)
  */
 void machine_kexec(struct kimage *image)
 {
+        int save_ftrace_enabled;
+
+        save_ftrace_enabled = __ftrace_enabled_save();
+
         if (ppc_md.machine_kexec)
                 ppc_md.machine_kexec(image);
         else
                 default_machine_kexec(image);
 
+        __ftrace_enabled_restore(save_ftrace_enabled);
+
         /* Fall back to normal restart if we're still alive. */
         machine_restart(NULL);
         for(;;);