diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/kernel/machine_kexec.c | |
| parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff) | |
| parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/kernel/machine_kexec.c')
| -rw-r--r-- | arch/arm/kernel/machine_kexec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index 81e989858d42..1fc74cbd1a19 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c @@ -37,10 +37,6 @@ void machine_kexec_cleanup(struct kimage *image) { } -void machine_shutdown(void) -{ -} - void machine_crash_shutdown(struct pt_regs *regs) { local_irq_disable(); @@ -78,7 +74,11 @@ void machine_kexec(struct kimage *image) (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE); printk(KERN_INFO "Bye!\n"); - cpu_proc_fin(); + local_irq_disable(); + local_fiq_disable(); setup_mm_for_reboot(0); /* mode is not used, so just pass 0*/ + flush_cache_all(); + cpu_proc_fin(); + flush_cache_all(); cpu_reset(reboot_code_buffer_phys); } |