qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kexec: rename ARCH_HAS_KEXEC_PURGATORY 

JIRA: https://issues.redhat.com/browse/RHEL-58641

Upstream Status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Conflict: Changes related to risc-v are discarded, and the hunk in
          arch/s390/Kbuild need be manually edited because of fuzz.

commit e6265fe7775ec51241850abc854c9652d4709996
Author: Eric DeVolder <eric.devolder@oracle.com>
Date:   Wed Jul 12 12:15:45 2023 -0400

    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>

Signed-off-by: Baoquan He <bhe@redhat.com>
This commit is contained in:
Baoquan He 2024-10-29 10:59:28 +08:00
parent c0f8920a46
commit e0333b614e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/Kconfig
View File

@ -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

2
arch/s390/Kbuild
View File

@ -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/

2
arch/s390/Kconfig
View File

@ -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

2
arch/x86/Kconfig
View File

@ -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

6
kernel/kexec_file.c
View File

@ -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)