2 files changed, 12 insertions, 3 deletions

diff --git a/kernel/kexec.c b/kernel/kexec.c
index a0411b3bd54a..277f22afe74b 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -18,6 +18,8 @@
 #include <linux/reboot.h>
 #include <linux/syscalls.h>
 #include <linux/ioport.h>
+#include <linux/hardirq.h>
+
 #include <asm/page.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -32,6 +34,13 @@ struct resource crashk_res = {
         .flags = IORESOURCE_BUSY | IORESOURCE_MEM
 };
 
+int kexec_should_crash(struct task_struct *p)
+{
+        if (in_interrupt() || !p->pid || p->pid == 1 || panic_on_oops)
+                return 1;
+        return 0;
+}
+
 /*
  * When kexec transitions to the new kernel there is a one-to-one
  * mapping between physical and virtual addresses.  On processors
@@ -1010,7 +1019,7 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
 }
 #endif
 
-void crash_kexec(void)
+void crash_kexec(struct pt_regs *regs)
 {
         struct kimage *image;
         int locked;
@@ -1028,7 +1037,7 @@ void crash_kexec(void)
         if (!locked) {
                 image = xchg(&kexec_crash_image, NULL);
                 if (image) {
-                        machine_crash_shutdown();
+                        machine_crash_shutdown(regs);
                         machine_kexec(image);
                 }
                 xchg(&kexec_lock, 0);
diff --git a/kernel/panic.c b/kernel/panic.c
index 66f43d33cd80..74ba5f3e46c7 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -83,7 +83,7 @@ NORET_TYPE void panic(const char * fmt, ...)
          * everything else.
          * Do we want to call this before we try to display a message?
          */
-        crash_kexec();
+        crash_kexec(NULL);
 
 #ifdef CONFIG_SMP
         /*