diff options
| author | Will Deacon <will@kernel.org> | 2023-04-20 11:22:04 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-04-20 11:22:04 +0100 |
| commit | f8863bc8c1f9cf4bc3bdc58a98c5a41d0b4c14c5 (patch) | |
| tree | 1e8ba49ec132d9f0943dd83c74892dacc797374e /arch/arm64/include | |
| parent | ea88dc925c3a24213abf6d428d8fc35f74ec10bd (diff) | |
| parent | 504cae453f8222884486f77f1fd3e8e0aa317dd7 (diff) | |
Merge branch 'for-next/kdump' into for-next/core
* for-next/kdump:
arm64: kdump: defer the crashkernel reservation for platforms with no DMA memory zones
arm64: kdump: do not map crashkernel region specifically
arm64: kdump : take off the protection on crashkernel memory region
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/kexec.h | 6 | ||||
| -rw-r--r-- | arch/arm64/include/asm/memory.h | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index 559bfae26715..9ac9572a3bbe 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -102,12 +102,6 @@ void cpu_soft_restart(unsigned long el2_switch, unsigned long entry, int machine_kexec_post_load(struct kimage *image); #define machine_kexec_post_load machine_kexec_post_load - -void arch_kexec_protect_crashkres(void); -#define arch_kexec_protect_crashkres arch_kexec_protect_crashkres - -void arch_kexec_unprotect_crashkres(void); -#define arch_kexec_unprotect_crashkres arch_kexec_unprotect_crashkres #endif #define ARCH_HAS_KIMAGE_ARCH diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 78e5163836a0..efcd68154a3a 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -374,11 +374,6 @@ static inline void *phys_to_virt(phys_addr_t x) }) void dump_mem_limit(void); - -static inline bool defer_reserve_crashkernel(void) -{ - return IS_ENABLED(CONFIG_ZONE_DMA) || IS_ENABLED(CONFIG_ZONE_DMA32); -} #endif /* !ASSEMBLY */ /* |