From: Eric DeVolder <eric.devolder@oracle•com>
To: linux@armlinux•org.uk, catalin.marinas@arm•com, will@kernel•org,
chenhuacai@kernel•org, geert@linux-m68k•org,
tsbogend@alpha•franken.de, James.Bottomley@HansenPartnership•com,
deller@gmx•de, ysato@users•sourceforge.jp, dalias@libc•org,
glaubitz@physik•fu-berlin.de, tglx@linutronix•de,
mingo@redhat•com, bp@alien8•de, dave.hansen@linux•intel.com,
x86@kernel•org, linux-kernel@vger•kernel.org,
linux-arm-kernel@lists•infradead.org, linux-ia64@vger•kernel.org,
loongarch@lists•linux.dev, linux-m68k@lists•linux-m68k.org,
linux-mips@vger•kernel.org, linux-parisc@vger•kernel.org,
linuxppc-dev@lists•ozlabs.org, linux-riscv@lists•infradead.org,
linux-s390@vger•kernel.org, linux-sh@vger•kernel.org
Cc: peterz@infradead•org, linus.walleij@linaro•org,
thunder.leizhen@huawei•com, hpa@zytor•com, kernel@xen0n•name,
eric.devolder@oracle•com, ardb@kernel•org, tsi@tuyoix•net,
agordeev@linux•ibm.com, paulmck@kernel•org, bhe@redhat•com,
masahiroy@kernel•org, konrad.wilk@oracle•com,
sebastian.reichel@collabora•com, samitolvanen@google•com,
ojeda@kernel•org, juerg.haefliger@canonical•com,
borntraeger@linux•ibm.com, frederic@kernel•org, arnd@arndb•de,
mhiramat@kernel•org, aou@eecs•berkeley.edu,
keescook@chromium•org, gor@linux•ibm.com,
anshuman.khandual@arm•com, hca@linux•ibm.com, xin3.li@intel•com,
npiggin@gmail•com, rmk+kernel@armlinux•org.uk,
paul.walmsley@sifive•com, boris.ostrovsky@oracle•com,
ziy@nvidia•com, hbathini@linux•ibm.com,
gregkh@linuxfoundation•org, kirill.shutemov@linux•intel.com,
ndesaulniers@google•com, sourabhjain@linux•ibm.com,
palmer@dabbelt•com, svens@linux•ibm.com, tj@kernel•org,
akpm@linux-foundation•org, rppt@kernel•org
Subject: [PATCH v6 14/14] kexec: rename ARCH_HAS_KEXEC_PURGATORY
Date: Wed, 12 Jul 2023 12:15:45 -0400 [thread overview]
Message-ID: <20230712161545.87870-15-eric.devolder@oracle.com> (raw)
In-Reply-To: <20230712161545.87870-1-eric.devolder@oracle.com>
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.
Signed-off-by: Eric DeVolder <eric.devolder@oracle•com>
---
arch/powerpc/Kconfig | 2 +-
arch/riscv/Kbuild | 2 +-
arch/riscv/Kconfig | 2 +-
arch/riscv/kernel/elf_kexec.c | 4 ++--
arch/s390/Kbuild | 2 +-
arch/s390/Kconfig | 2 +-
arch/x86/Kconfig | 2 +-
kernel/kexec_file.c | 6 +++---
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 1695a71777f0..7709b62e6843 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -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
diff --git a/arch/riscv/Kbuild b/arch/riscv/Kbuild
index afa83e307a2e..d25ad1c19f88 100644
--- a/arch/riscv/Kbuild
+++ b/arch/riscv/Kbuild
@@ -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
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 23d0fbbe1367..a39c5d03f59c 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -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
diff --git a/arch/riscv/kernel/elf_kexec.c b/arch/riscv/kernel/elf_kexec.c
index 5372b708fae2..cc556beb293a 100644
--- a/arch/riscv/kernel/elf_kexec.c
+++ b/arch/riscv/kernel/elf_kexec.c
@@ -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) {
diff --git a/arch/s390/Kbuild b/arch/s390/Kbuild
index 76e362277179..48a3588d703c 100644
--- a/arch/s390/Kbuild
+++ b/arch/s390/Kbuild
@@ -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
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 40beaf1f3d73..ab723218c0fb 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -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
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9767a343f7c2..fedc6dddd743 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 881ba0d1714c..dd115571f8fc 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -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)
--
2.31.1
prev parent reply other threads:[~2023-07-12 22:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-12 16:15 [PATCH v6 00/14] refactor Kconfig to consolidate KEXEC and CRASH options Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 01/14] kexec: consolidate kexec and crash options into kernel/Kconfig.kexec Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 02/14] x86/kexec: refactor for kernel/Kconfig.kexec Eric DeVolder
2023-07-13 11:13 ` Leizhen (ThunderTown)
2023-08-22 6:32 ` Michal Suchánek
2023-07-12 16:15 ` [PATCH v6 03/14] arm/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 04/14] ia64/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 05/14] arm64/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 06/14] loongarch/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 07/14] m68k/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 08/14] mips/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 09/14] parisc/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 10/14] powerpc/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 11/14] riscv/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 12/14] s390/kexec: " Eric DeVolder
2023-07-12 16:15 ` [PATCH v6 13/14] sh/kexec: " Eric DeVolder
2023-07-12 16:15 ` Eric DeVolder [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230712161545.87870-15-eric.devolder@oracle.com \
--to=eric.devolder@oracle$(echo .)com \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=agordeev@linux$(echo .)ibm.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=anshuman.khandual@arm$(echo .)com \
--cc=aou@eecs$(echo .)berkeley.edu \
--cc=ardb@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=bhe@redhat$(echo .)com \
--cc=boris.ostrovsky@oracle$(echo .)com \
--cc=borntraeger@linux$(echo .)ibm.com \
--cc=bp@alien8$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=dalias@libc$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=deller@gmx$(echo .)de \
--cc=frederic@kernel$(echo .)org \
--cc=geert@linux-m68k$(echo .)org \
--cc=glaubitz@physik$(echo .)fu-berlin.de \
--cc=gor@linux$(echo .)ibm.com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hbathini@linux$(echo .)ibm.com \
--cc=hca@linux$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=juerg.haefliger@canonical$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=kernel@xen0n$(echo .)name \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-ia64@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-m68k@lists$(echo .)linux-m68k.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-riscv@lists$(echo .)infradead.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=loongarch@lists$(echo .)linux.dev \
--cc=masahiroy@kernel$(echo .)org \
--cc=mhiramat@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=ndesaulniers@google$(echo .)com \
--cc=npiggin@gmail$(echo .)com \
--cc=ojeda@kernel$(echo .)org \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul.walmsley@sifive$(echo .)com \
--cc=paulmck@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=rmk+kernel@armlinux$(echo .)org.uk \
--cc=rppt@kernel$(echo .)org \
--cc=samitolvanen@google$(echo .)com \
--cc=sebastian.reichel@collabora$(echo .)com \
--cc=sourabhjain@linux$(echo .)ibm.com \
--cc=svens@linux$(echo .)ibm.com \
--cc=tglx@linutronix$(echo .)de \
--cc=thunder.leizhen@huawei$(echo .)com \
--cc=tj@kernel$(echo .)org \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=tsi@tuyoix$(echo .)net \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=xin3.li@intel$(echo .)com \
--cc=ysato@users$(echo .)sourceforge.jp \
--cc=ziy@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox