diff options
| author | Pavel Tatashin <pasha.tatashin@soleen.com> | 2019-12-04 10:59:17 -0500 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-01-08 16:32:55 +0000 |
| commit | 621516789ee6e285cb2088fe4706eedd030d38bf (patch) | |
| tree | f3fc0734939eb30972d8dad267b2702c178e30b6 /arch/arm64/kernel/machine_kexec.c | |
| parent | 3b54b743397eb51f879f2bf24b9938b80e5a2092 (diff) | |
| download | linux-stable-621516789ee6e285cb2088fe4706eedd030d38bf.tar.gz linux-stable-621516789ee6e285cb2088fe4706eedd030d38bf.tar.bz2 linux-stable-621516789ee6e285cb2088fe4706eedd030d38bf.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>
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 8e9c924423b4..ae1bad0156cd 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -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 + kimage->arch.dtb_mem); BUG(); /* Should never get here. */ } |