diff options
| author | Will Deacon <will@kernel.org> | 2020-01-10 16:00:50 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-01-10 16:00:50 +0000 |
| commit | 1595fe299eb5a664c754eaf48bc178c0d664e1cf (patch) | |
| tree | 465180c7adb25ce5a326780efc4cefda124b0d08 /arch/arm64/kernel/machine_kexec.c | |
| parent | a2c2e67923ecb73c92028e9b128a9bd48d2e25e9 (diff) | |
| download | linux-stable-1595fe299eb5a664c754eaf48bc178c0d664e1cf.tar.gz linux-stable-1595fe299eb5a664c754eaf48bc178c0d664e1cf.tar.bz2 linux-stable-1595fe299eb5a664c754eaf48bc178c0d664e1cf.zip | |
Revert "arm64: kexec: make dtb_mem always enabled"
Adding crash dump support to 'kexec_file' is going to extend 'struct
kimage_arch' with more 'kexec_file'-specific members. The cleanup here
then starts to get in the way, so revert it.
This reverts commit 621516789ee6e285cb2088fe4706eedd030d38bf.
Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
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, 5 insertions, 1 deletions
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index ae1bad0156cd..8e9c924423b4 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -203,7 +203,11 @@ 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, - kimage->arch.dtb_mem); +#ifdef CONFIG_KEXEC_FILE + kimage->arch.dtb_mem); +#else + 0); +#endif BUG(); /* Should never get here. */ } |