080f64dafa
- Update to version 2.0.14 (bsc#1039937, FATE#320672, FATE#320671) Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.13..v2.0.14 - Backport upstream fixes (bsc#1039937, FATE#320672, FATE#320671) 0001-kexec-tools-2.0.14.git.patch 0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch 0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch 0004-alpha-add-missing-__NR_kexec_load-definition.patch 0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch 0006-kexec-Remove-redundant-space-from-help-message.patch 0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch 0008-kexec-Add-option-to-get-crash-kernel-region-size.patch 0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch 0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch 0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch 0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch 0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch 0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch 0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch 0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch 0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch 0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch 0019-gitignore-add-two-generated-files-in-purgatory.patch 0020-Only-print-debug-message-when-failed-to-serach-for-k.patch 0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch 0022-uImage-fix-realloc-pointer-confusion.patch 0023-uImage-Fix-uImage_load-for-little-endian-machines.patch 0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0027-arm64-add-uImage-support.patch OBS-URL: https://build.opensuse.org/request/show/500203 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=83
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From fab91841c717150aca4bc73e4c54769305e27ade Mon Sep 17 00:00:00 2001
|
|
From: Eric DeVolder <eric.devolder@oracle.com>
|
|
Date: Wed, 10 May 2017 11:03:37 -0500
|
|
Subject: [PATCH 45/45] Handle additional e820 memmap type strings
|
|
|
|
Keep pace with changes to linux arch/x86/kernel/e820.c to
|
|
function e820_type_to_string(). With this change, the following
|
|
messages from kexec are eliminated (and allows kexec to load):
|
|
|
|
Unknown type (Reserved) while parsing /sys/firmware/memmap/8/type.
|
|
Please report this as bug. Using RANGE_RESERVED now.
|
|
|
|
Unknown type (Unknown E820 type) while parsing /sys/firmware/memmap/4/type.
|
|
Please report this as bug. Using RANGE_RESERVED now.
|
|
|
|
Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
---
|
|
kexec/firmware_memmap.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/kexec/firmware_memmap.c b/kexec/firmware_memmap.c
|
|
index 4d84f0011c57..1ee214aa9316 100644
|
|
--- a/kexec/firmware_memmap.c
|
|
+++ b/kexec/firmware_memmap.c
|
|
@@ -164,6 +164,10 @@ static int parse_memmap_entry(const char *entry, struct memory_range *range)
|
|
range->type = RANGE_RESERVED;
|
|
else if (strcmp(type, "reserved") == 0)
|
|
range->type = RANGE_RESERVED;
|
|
+ else if (strcmp(type, "Reserved") == 0)
|
|
+ range->type = RANGE_RESERVED;
|
|
+ else if (strcmp(type, "Unknown E820 type") == 0)
|
|
+ range->type = RANGE_RESERVED;
|
|
else if (strcmp(type, "ACPI Non-volatile Storage") == 0)
|
|
range->type = RANGE_ACPI_NVS;
|
|
else if (strcmp(type, "Uncached RAM") == 0)
|
|
--
|
|
2.13.0
|
|
|