Commit 62151678 authored by Pavel Tatashin's avatar Pavel Tatashin Committed by Will Deacon
Browse files

arm64: kexec: make dtb_mem always enabled 



Currently, dtb_mem is enabled only when CONFIG_KEXEC_FILE is
enabled. This adds ugly ifdefs to c files.

Always enabled dtb_mem, when it is not used, it is NULL.
Change the dtb_mem to phys_addr_t, as it is a physical address.

Signed-off-by: default avatarPavel Tatashin <pasha.tatashin@soleen.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 3b54b743

arch/arm64/include/asm/kexec.h

+2 −2
Original line number Diff line number Diff line
@@ -90,14 +90,14 @@ static inline void crash_prepare_suspend(void) {} 
static inline void crash_post_resume(void) {}

#endif



#ifdef CONFIG_KEXEC_FILE

#define ARCH_HAS_KIMAGE_ARCH



struct kimage_arch {

	void *dtb;

	unsigned long dtb_mem;

	phys_addr_t dtb_mem;

};



#ifdef CONFIG_KEXEC_FILE

extern const struct kexec_file_ops kexec_image_ops;



struct kimage;

arch/arm64/kernel/machine_kexec.c

+1 −5
Original line number Diff line number Diff line
@@ -203,11 +203,7 @@ void machine_kexec(struct kimage *kimage) 
	 * In kexec_file case, the kernel starts directly without purgatory.

	 */

	cpu_soft_restart(reboot_code_buffer_phys, kimage->head, kimage->start,

#ifdef CONFIG_KEXEC_FILE

			 kimage->arch.dtb_mem);

#else

						0);

#endif



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

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE