kexec-rename-arch_has_kexec_purgatory.patch removed from -mm tree
The quilt patch titled
Subject: kexec: rename ARCH_HAS_KEXEC_PURGATORY
has been removed from the -mm tree. Its filename was
kexec-rename-arch_has_kexec_purgatory.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Eric DeVolder <[email protected]>
Subject: kexec: rename ARCH_HAS_KEXEC_PURGATORY
Date: Wed, 12 Jul 2023 12:15:45 -0400
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.
---
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(-)
arch/powerpc/Kconfig renamed from arch/powerpc/Kconfig~kexec-rename-arch_has_kexec_purgatory +1 -1
@@ -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 renamed from arch/riscv/Kbuild~kexec-rename-arch_has_kexec_purgatory +1 -1
@@ -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 renamed from arch/riscv/Kconfig~kexec-rename-arch_has_kexec_purgatory +1 -1
@@ -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 renamed from arch/riscv/kernel/elf_kexec.c~kexec-rename-arch_has_kexec_purgatory +2 -2
@@ -260,7 +260,7 @@ static void *elf_kexec_load(struct kimag 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 kimag 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 renamed from arch/s390/Kbuild~kexec-rename-arch_has_kexec_purgatory +1 -1
@@ -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
arch/s390/Kconfig renamed from arch/s390/Kconfig~kexec-rename-arch_has_kexec_purgatory +1 -1
@@ -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
arch/x86/Kconfig renamed from arch/x86/Kconfig~kexec-rename-arch_has_kexec_purgatory +1 -1
@@ -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
kernel/kexec_file.c renamed from kernel/kexec_file.c~kexec-rename-arch_has_kexec_purgatory +3 -3
@@ -685,7 +685,7 @@ static int kexec_calculate_store_digestsstruct 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 @@ 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.
@@ -1150,7 +1150,7 @@ int kexec_purgatory_get_set_symbol(struc 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)
_
Patches currently in -mm which might be from [email protected] are
crash-move-a-few-code-bits-to-setup-support-of-crash-hotplug.patch crash-add-generic-infrastructure-for-crash-hotplug-support.patch kexec-exclude-elfcorehdr-from-the-segment-digest.patch crash-memory-and-cpu-hotplug-sysfs-attributes.patch x86-crash-add-x86-crash-hotplug-support.patch crash-hotplug-support-for-kexec_load.patch crash-change-crash_prepare_elf64_headers-to-for_each_possible_cpu.patch x86-crash-optimize-cpu-changes.patch