Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c56b3117 authored by Akshay Adiga's avatar Akshay Adiga
Browse files

arm64/kdump: Build fix for CONFIG_KEXEC 



Compilation/Build fix when CONFIG_KEXEC is enabled
This is caused because of :
   a) commit 6c4d635c ("Revert "arm64: kill flush_cache_all()"")
   included internally adds asm code for cpu_soft_restart and defined
   in proc-fns.h. It was added so that ramdump contains all dirty
   cache data and cache flush in reboot.

   b) commit f9076ecf ("arm64: Add back cpu reset routines") from
   upstream adds cpu_soft_restart in cpu_reset.h and hooks it up to
   hyp-stub. This patch's main intention was to add support for kexec.

   The patch chooses to rename function in (b) because it's intended
   use is for kexec.

Change-Id: Ide95220b5f609a82eaf3fcb64c155080be0f39dd
Signed-off-by: default avatarPrateek Sood <prsood@codeaurora.org>
Signed-off-by: default avatarAkshay Adiga <aadiga@codeaurora.org>
parent 4c8629bc

arch/arm64/kernel/cpu-reset.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry,

	unsigned long arg0, unsigned long arg1, unsigned long arg2);



static inline void __noreturn cpu_soft_restart(unsigned long el2_switch,

static inline void __noreturn cpu_soft_restart_kexec(unsigned long el2_switch,

	unsigned long entry, unsigned long arg0, unsigned long arg1,

	unsigned long arg2)

{

arch/arm64/kernel/machine_kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ void machine_kexec(struct kimage *kimage) 
	 * relocation is complete.

	 */



	cpu_soft_restart(kimage != kexec_crash_image,

	cpu_soft_restart_kexec(kimage != kexec_crash_image,

		reboot_code_buffer_phys, kimage->head, kimage->start, 0);



	BUG(); /* Should never get here. */