Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kexec: rename ARCH_HAS_KEXEC_PURGATORY

The Kconfig refactor to consolidate KEXEC and CRASH options utilized
option names of the form ARCH_SUPPORTS_<option>. Thus rename the
ARCH_HAS_KEXEC_PURGATORY to ARCH_SUPPORTS_KEXEC_PURGATORY to follow
the same.

Link: https://lkml.kernel.org/r/20230712161545.87870-15-eric.devolder@oracle.com
Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Eric DeVolder and committed by
Andrew Morton
e6265fe7 40445d06

+11 -11
+1 -1
arch/powerpc/Kconfig
··· 595 595 config ARCH_SUPPORTS_KEXEC_FILE 596 596 def_bool PPC64 && CRYPTO=y && CRYPTO_SHA256=y 597 597 598 - config ARCH_HAS_KEXEC_PURGATORY 598 + config ARCH_SUPPORTS_KEXEC_PURGATORY 599 599 def_bool KEXEC_FILE 600 600 601 601 config ARCH_SELECTS_KEXEC_FILE
+1 -1
arch/riscv/Kbuild
··· 5 5 obj-y += errata/ 6 6 obj-$(CONFIG_KVM) += kvm/ 7 7 8 - obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += purgatory/ 8 + obj-$(CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY) += purgatory/ 9 9 10 10 # for cleaning 11 11 subdir- += boot
+1 -1
arch/riscv/Kconfig
··· 667 667 select HAVE_IMA_KEXEC if IMA 668 668 select KEXEC_ELF 669 669 670 - config ARCH_HAS_KEXEC_PURGATORY 670 + config ARCH_SUPPORTS_KEXEC_PURGATORY 671 671 def_bool KEXEC_FILE 672 672 depends on CRYPTO=y 673 673 depends on CRYPTO_SHA256=y
+2 -2
arch/riscv/kernel/elf_kexec.c
··· 260 260 cmdline = modified_cmdline; 261 261 } 262 262 263 - #ifdef CONFIG_ARCH_HAS_KEXEC_PURGATORY 263 + #ifdef CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY 264 264 /* Add purgatory to the image */ 265 265 kbuf.top_down = true; 266 266 kbuf.mem = KEXEC_BUF_MEM_UNKNOWN; ··· 274 274 sizeof(kernel_start), 0); 275 275 if (ret) 276 276 pr_err("Error update purgatory ret=%d\n", ret); 277 - #endif /* CONFIG_ARCH_HAS_KEXEC_PURGATORY */ 277 + #endif /* CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY */ 278 278 279 279 /* Add the initrd to the image */ 280 280 if (initrd != NULL) {
+1 -1
arch/s390/Kbuild
··· 7 7 obj-$(CONFIG_APPLDATA_BASE) += appldata/ 8 8 obj-y += net/ 9 9 obj-$(CONFIG_PCI) += pci/ 10 - obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += purgatory/ 10 + obj-$(CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY) += purgatory/ 11 11 12 12 # for cleaning 13 13 subdir- += boot tools
+1 -1
arch/s390/Kconfig
··· 257 257 config ARCH_SUPPORTS_KEXEC_SIG 258 258 def_bool MODULE_SIG_FORMAT 259 259 260 - config ARCH_HAS_KEXEC_PURGATORY 260 + config ARCH_SUPPORTS_KEXEC_PURGATORY 261 261 def_bool KEXEC_FILE 262 262 263 263 config ARCH_SUPPORTS_CRASH_DUMP
+1 -1
arch/x86/Kconfig
··· 2051 2051 depends on KEXEC_FILE 2052 2052 select HAVE_IMA_KEXEC if IMA 2053 2053 2054 - config ARCH_HAS_KEXEC_PURGATORY 2054 + config ARCH_SUPPORTS_KEXEC_PURGATORY 2055 2055 def_bool KEXEC_FILE 2056 2056 2057 2057 config ARCH_SUPPORTS_KEXEC_SIG
+3 -3
kernel/kexec_file.c
··· 685 685 struct kexec_sha_region *sha_regions; 686 686 struct purgatory_info *pi = &image->purgatory_info; 687 687 688 - if (!IS_ENABLED(CONFIG_ARCH_HAS_KEXEC_PURGATORY)) 688 + if (!IS_ENABLED(CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY)) 689 689 return 0; 690 690 691 691 zero_buf = __va(page_to_pfn(ZERO_PAGE(0)) << PAGE_SHIFT); ··· 790 790 return ret; 791 791 } 792 792 793 - #ifdef CONFIG_ARCH_HAS_KEXEC_PURGATORY 793 + #ifdef CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY 794 794 /* 795 795 * kexec_purgatory_setup_kbuf - prepare buffer to load purgatory. 796 796 * @pi: Purgatory to be loaded. ··· 1150 1150 1151 1151 return 0; 1152 1152 } 1153 - #endif /* CONFIG_ARCH_HAS_KEXEC_PURGATORY */ 1153 + #endif /* CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY */ 1154 1154 1155 1155 int crash_exclude_mem_range(struct crash_mem *mem, 1156 1156 unsigned long long mstart, unsigned long long mend)