[folded-merged] kexec_file-make-an-use-of-purgatory-optional-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: kexec_file-make-an-use-of-purgatory-optional-fix
has been removed from the -mm tree.  Its filename was
     kexec_file-make-an-use-of-purgatory-optional-fix.patch

This patch was dropped because it was folded into kexec_file-make-an-use-of-purgatory-optional.patch

------------------------------------------------------
From: AKASHI Takahiro <takahiro.akashi@xxxxxxxxxx>
Subject: kexec_file-make-an-use-of-purgatory-optional-fix

fix trivial screwup

Link: http://lkml.kernel.org/r/20180309093346.GF25863@xxxxxxxxxx
Tested-by: Dave Young <dyoung@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/kexec_file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/kexec_file.c~kexec_file-make-an-use-of-purgatory-optional-fix kernel/kexec_file.c
--- a/kernel/kexec_file.c~kexec_file-make-an-use-of-purgatory-optional-fix
+++ a/kernel/kexec_file.c
@@ -532,7 +532,7 @@ static int kexec_calculate_store_digests
 	struct kexec_sha_region *sha_regions;
 	struct purgatory_info *pi = &image->purgatory_info;
 
-	if (!IS_ENABLED(ARCH_HAS_KEXEC_PURGATORY))
+	if (!IS_ENABLED(CONFIG_ARCH_HAS_KEXEC_PURGATORY))
 		return 0;
 
 	zero_buf = __va(page_to_pfn(ZERO_PAGE(0)) << PAGE_SHIFT);
_

Patches currently in -mm which might be from takahiro.akashi@xxxxxxxxxx are

kexec_file-make-an-use-of-purgatory-optional.patch
kexec_filex86powerpc-factor-out-kexec_file_ops-functions.patch
x86-kexec_file-purge-system-ram-walking-from-prepare_elf64_headers.patch
x86-kexec_file-remove-x86_64-dependency-from-prepare_elf64_headers.patch
x86-kexec_file-lift-crash_max_ranges-limit-on-crash_mem-buffer.patch
x86-kexec_file-clean-up-prepare_elf64_headers.patch
kexec_file-x86-move-re-factored-code-to-generic-side.patch
resource-add-walk_system_ram_res_rev.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux