diff options
| author | Pavel Tatashin <pasha.tatashin@soleen.com> | 2021-01-25 14:19:06 -0500 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-01-27 15:41:11 +0000 |
| commit | 117cda9a7847286484d2353af64728a9875effd4 (patch) | |
| tree | 77d486ff12f7fbcd2d31ef5cc584a29951f1d47e /arch/arm64/kernel/machine_kexec.c | |
| parent | 19c329f6808995b142b3966301f217c831e7cf31 (diff) | |
| download | linux-117cda9a7847286484d2353af64728a9875effd4.tar.gz linux-117cda9a7847286484d2353af64728a9875effd4.tar.bz2 linux-117cda9a7847286484d2353af64728a9875effd4.zip | |
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: Pavel Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: James Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20210125191923.1060122-2-pasha.tatashin@soleen.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/machine_kexec.c')
| -rw-r--r-- | arch/arm64/kernel/machine_kexec.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index a0b144cfaea7..8096a6aa1d49 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -204,11 +204,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 + kimage->arch.dtb_mem); BUG(); /* Should never get here. */ } |