1 files changed, 12 insertions, 4 deletions

diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index bc2f64d72244..9d92097ce96d 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -79,6 +79,7 @@ crash_save_this_cpu()
         final_note(buf);
 }
 
+#ifdef CONFIG_SMP
 static int
 kdump_wait_cpu_freeze(void)
 {
@@ -91,6 +92,7 @@ kdump_wait_cpu_freeze(void)
         }
         return 1;
 }
+#endif
 
 void
 machine_crash_shutdown(struct pt_regs *pt)
@@ -116,6 +118,11 @@ machine_crash_shutdown(struct pt_regs *pt)
 static void
 machine_kdump_on_init(void)
 {
+        if (!ia64_kimage) {
+                printk(KERN_NOTICE "machine_kdump_on_init(): "
+                                "kdump not configured\n");
+                return;
+        }
         local_irq_disable();
         kexec_disable_iosapic();
         machine_kexec(ia64_kimage);
@@ -132,11 +139,12 @@ kdump_cpu_freeze(struct unw_frame_info *info, void *arg)
         atomic_inc(&kdump_cpu_freezed);
         kdump_status[cpuid] = 1;
         mb();
-        if (cpuid == 0) {
-                for (;;)
-                        cpu_relax();
-        } else
+#ifdef CONFIG_HOTPLUG_CPU
+        if (cpuid != 0)
                 ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
+#endif
+        for (;;)
+                cpu_relax();
 }
 
 static int