Merge branch 'misc' into devel

[net-next-2.6.git] / arch / arm / kernel / machine_kexec.c

diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index df5958f6864fcde5cb3b8f1957f1cc589e0edd2e..1fc74cbd1a193ee4dcd2fd50afdd279804d9e5fd 100644 (file)
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -39,6 +39,10 @@ void machine_kexec_cleanup(struct kimage *image)
 
 void machine_crash_shutdown(struct pt_regs *regs)
 {
+       local_irq_disable();
+       crash_save_cpu(regs, smp_processor_id());
+
+       printk(KERN_INFO "Loading crashdump kernel...\n");
 }
 
 void machine_kexec(struct kimage *image)