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/include | |
| parent | a2c2e67923ecb73c92028e9b128a9bd48d2e25e9 (diff) | |
| download | blackbird-op-linux-1595fe299eb5a664c754eaf48bc178c0d664e1cf.tar.gz blackbird-op-linux-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/include')
| -rw-r--r-- | arch/arm64/include/asm/kexec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index ad6afed69078..12a561a54128 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; |
