Commit e6265fe7 authored by Eric DeVolder's avatar Eric DeVolder Committed by Andrew Morton
Browse files

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: default avatarEric DeVolder <eric.devolder@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 40445d06

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,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

arch/riscv/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ obj-$(CONFIG_BUILTIN_DTB) += boot/dts/ 
obj-y += errata/

obj-$(CONFIG_KVM) += kvm/



obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += purgatory/

obj-$(CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY) += purgatory/



# for cleaning

subdir- += boot

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ config ARCH_SELECTS_KEXEC_FILE 
	select HAVE_IMA_KEXEC if IMA

	select KEXEC_ELF



config ARCH_HAS_KEXEC_PURGATORY

config ARCH_SUPPORTS_KEXEC_PURGATORY

	def_bool KEXEC_FILE

	depends on CRYPTO=y

	depends on CRYPTO_SHA256=y

arch/riscv/kernel/elf_kexec.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void *elf_kexec_load(struct kimage *image, char *kernel_buf, 
		cmdline = modified_cmdline;

	}



#ifdef CONFIG_ARCH_HAS_KEXEC_PURGATORY

#ifdef CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY

	/* Add purgatory to the image */

	kbuf.top_down = true;

	kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
@@ -274,7 +274,7 @@ static void *elf_kexec_load(struct kimage *image, char *kernel_buf, 
					     sizeof(kernel_start), 0);

	if (ret)

		pr_err("Error update purgatory ret=%d\n", ret);

#endif /* CONFIG_ARCH_HAS_KEXEC_PURGATORY */

#endif /* CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY */



	/* Add the initrd to the image */

	if (initrd != NULL) {

arch/s390/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ obj-$(CONFIG_S390_HYPFS_FS) += 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/



# for cleaning

subdir- += boot tools