commit 3f2bc4d6eb5a4fada842462ba22bb6bbb41d00c7
author Bryan Huntsman <bryanh@codeaurora.org> Tue Aug 16 17:27:22 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 09:57:10 2011 -0700
tree 088e0646c8abcbde263d13ee865ba69032ac86dd
parent f06154cc47399dfdb3950d3e6b71d67ee186f69d

Initial Contribution

msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>

arch/arm/kernel/machine_kexec.c

diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index e59bbd4..601ef74 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -86,6 +86,7 @@
 	unsigned long reboot_code_buffer_phys;
 	void *reboot_code_buffer;
 
+	arch_kexec();
 
 	page_list = image->head & PAGE_MASK;
 
@@ -120,5 +121,5 @@
 	cpu_proc_fin();
 	outer_inv_all();
 	flush_cache_all();
-	cpu_reset(reboot_code_buffer_phys);
+	__virt_to_phys(cpu_reset)(reboot_code_buffer_phys);
 }