1 files changed, 8 insertions, 5 deletions

diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index b2367dd66766..f1cf2df97a2d 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -118,11 +118,6 @@ machine_crash_shutdown(struct pt_regs *pt)
 static void
 machine_kdump_on_init(void)
 {
-        if (!ia64_kimage) {
-                ia64_mca_printk(KERN_NOTICE "machine_kdump_on_init(): "
-                                "kdump not configured\n");
-                return;
-        }
         local_irq_disable();
         kexec_disable_iosapic();
         machine_kexec(ia64_kimage);
@@ -156,6 +151,14 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
         if (!kdump_on_init)
                 return NOTIFY_DONE;
 
+        if (!ia64_kimage) {
+                if (val == DIE_INIT_MONARCH_LEAVE)
+                        ia64_mca_printk(KERN_NOTICE
+                                        "%s: kdump not configured\n",
+                                        __FUNCTION__);
+                return NOTIFY_DONE;
+        }
+
         if (val != DIE_INIT_MONARCH_LEAVE &&
             val != DIE_INIT_SLAVE_LEAVE &&
             val != DIE_INIT_MONARCH_PROCESS &&