mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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>
This commit is contained in:
parent
40445d0601
commit
e6265fe777
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -257,7 +257,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
|
||||
|
|
|
@ -2051,7 +2051,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
|
||||
|
|
|
@ -685,7 +685,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);
|
||||
|
@ -790,7 +790,7 @@ static int kexec_calculate_store_digests(struct kimage *image)
|
|||
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.
|
||||
|
@ -1150,7 +1150,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)
|
||||
|
|
Loading…
Reference in a new issue