diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/kernel | |
parent | 8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff) | |
parent | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff) | |
download | linux-9bafc74163d8bccca9810159aab39be926fb877c.tar.bz2 |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/machine_kexec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index 1fc74cbd1a19..3a8fd5140d7a 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c @@ -78,7 +78,10 @@ void machine_kexec(struct kimage *image) local_fiq_disable(); setup_mm_for_reboot(0); /* mode is not used, so just pass 0*/ flush_cache_all(); + outer_flush_all(); + outer_disable(); cpu_proc_fin(); + outer_inv_all(); flush_cache_all(); cpu_reset(reboot_code_buffer_phys); } |