diff options
| author | Eric DeVolder <eric.devolder@oracle.com> | 2017-05-10 11:03:37 -0500 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2017-05-22 13:43:07 +0200 |
| commit | fab91841c717150aca4bc73e4c54769305e27ade (patch) | |
| tree | a3bf9fef55c9616105d3247753df2f93205c25a1 | |
| parent | c504ff5d85aa035aed9f14f5ce96c5d959952dd9 (diff) | |
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>
| -rw-r--r-- | kexec/firmware_memmap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kexec/firmware_memmap.c b/kexec/firmware_memmap.c index 4d84f00..1ee214a 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) |