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

Commit 6ad2f126 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64/kdump: Build fix for CONFIG_KEXEC"

parents d8eb3d56 c56b3117

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. */