Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[powerpc.git] / arch / ia64 / kernel / crash.c

diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index 2018e62..37bb16f 100644 (file)
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -52,7 +52,7 @@ extern void ia64_dump_cpu_regs(void *);
 static DEFINE_PER_CPU(struct elf_prstatus, elf_prstatus);
 
 void
-crash_save_this_cpu()
+crash_save_this_cpu(void)
 {
        void *buf;
        unsigned long cfm, sof, sol;
@@ -118,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);