diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index bdf24a06286f..48c88a2b2805 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -532,7 +532,7 @@ config ARCH_SUPPORTS_KEXEC config ARCH_SUPPORTS_KEXEC_FILE def_bool PPC64 && CRYPTO=y && CRYPTO_SHA256=y -config ARCH_HAS_KEXEC_PURGATORY +config ARCH_SUPPORTS_KEXEC_PURGATORY def_bool KEXEC_FILE config ARCH_SELECTS_KEXEC_FILE diff --git a/arch/s390/Kbuild b/arch/s390/Kbuild index d883b3b0c9b2..31e3dda66402 100644 --- a/arch/s390/Kbuild +++ b/arch/s390/Kbuild @@ -7,4 +7,4 @@ obj-$(CONFIG_S390_HYPFS) += hypfs/ obj-$(CONFIG_APPLDATA_BASE) += appldata/ obj-y += net/ obj-$(CONFIG_PCI) += pci/ -obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += purgatory/ +obj-$(CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY) += purgatory/ diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 6be6c4ee28a5..d95556d10c19 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -262,7 +262,7 @@ config ARCH_SUPPORTS_KEXEC_FILE config ARCH_SUPPORTS_KEXEC_SIG def_bool MODULE_SIG_FORMAT -config ARCH_HAS_KEXEC_PURGATORY +config ARCH_SUPPORTS_KEXEC_PURGATORY def_bool KEXEC_FILE config ARCH_SUPPORTS_CRASH_DUMP diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 415ceb2c5a65..55b20dabd9a9 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2076,7 +2076,7 @@ config ARCH_SELECTS_KEXEC_FILE depends on KEXEC_FILE select HAVE_IMA_KEXEC if IMA -config ARCH_HAS_KEXEC_PURGATORY +config ARCH_SUPPORTS_KEXEC_PURGATORY def_bool KEXEC_FILE config ARCH_SUPPORTS_KEXEC_SIG diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 812da7199d6f..2e72c2be28e0 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -693,7 +693,7 @@ static int kexec_calculate_store_digests(struct kimage *image) struct kexec_sha_region *sha_regions; struct purgatory_info *pi = &image->purgatory_info; - if (!IS_ENABLED(CONFIG_ARCH_HAS_KEXEC_PURGATORY)) + if (!IS_ENABLED(CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY)) return 0; zero_buf = __va(page_to_pfn(ZERO_PAGE(0)) << PAGE_SHIFT); @@ -798,7 +798,7 @@ out: return ret; } -#ifdef CONFIG_ARCH_HAS_KEXEC_PURGATORY +#ifdef CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY /* * kexec_purgatory_setup_kbuf - prepare buffer to load purgatory. * @pi: Purgatory to be loaded. @@ -1158,7 +1158,7 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name, return 0; } -#endif /* CONFIG_ARCH_HAS_KEXEC_PURGATORY */ +#endif /* CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY */ int crash_exclude_mem_range(struct crash_mem *mem, unsigned long long mstart, unsigned long long mend)