From: Will Deacon <will@kernel.org>
Date: Fri, 10 Jan 2020 16:00:50 +0000 (+0000)
Subject: Revert "arm64: kexec: make dtb_mem always enabled"
X-Git-Tag: v5.6-rc1~208^2~4^7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1595fe299eb5a664c754eaf48bc178c0d664e1cf;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index ad6afed690786..12a561a54128c 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -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;
-	phys_addr_t dtb_mem;
+	unsigned long dtb_mem;
 };
 
-#ifdef CONFIG_KEXEC_FILE
 extern const struct kexec_file_ops kexec_image_ops;
 
 struct kimage;
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index ae1bad0156cdf..8e9c924423b4e 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. */
 }