summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCliff Wickman <cpw@sgi.com>2010-06-17 11:37:06 -0500
committerSimon Horman <horms@verge.net.au>2010-06-18 09:06:01 +0900
commit26ed909df48ea3db3f7395713a9c68c94d091032 (patch)
tree5ea981a39f244c84ede7638ae2f2bdfe5421fb74
parent4b4b2a533e218e287ab4aed25678434ad938309e (diff)
kexec: Unusable memory range type
On SGI UV (x86_64) kexec grumbles about 'Unusable memory' ranges: Unknown type (%s) while parsing %s. Please " "report this as bug. Using RANGE_RESERVED now. uv44-sys:~ # cat /proc/iomem 00000000-00000fff : System RAM 00001000-00005fff : reserved 00006000-0008efff : System RAM 0008f000-0008ffff : ACPI Non-volatile Storage 00090000-0009ffff : System RAM 00100000-75ffcfff : System RAM 01000000-0139dcaf : Kernel code 0139dcb0-0192c12f : Kernel data 01a28000-01cd7777 : Kernel bss 02000000-09ffffff : Crash kernel 75ffd000-76013fff : Unusable memory 76014000-766a6fff : System RAM 766a7000-766d6fff : Unusable memory ... This patch keeps Unusable memory as another RANGE_RESERVED area, but without the warning message. Diffed against git.kernel.org/pub/scm/linux/kernel/git/horms/kexec-tools.git Signed-off-by: Cliff Wickman <cpw@sgi.com> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--kexec/firmware_memmap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kexec/firmware_memmap.c b/kexec/firmware_memmap.c
index 5f82a10..d8afed5 100644
--- a/kexec/firmware_memmap.c
+++ b/kexec/firmware_memmap.c
@@ -161,6 +161,8 @@ static int parse_memmap_entry(const char *entry, struct memory_range *range)
range->type = RANGE_RAM;
else if (strcmp(type, "ACPI Tables") == 0)
range->type = RANGE_ACPI;
+ else if (strcmp(type, "Unusable memory") == 0)
+ range->type = RANGE_RESERVED;
else if (strcmp(type, "reserved") == 0)
range->type = RANGE_RESERVED;
else if (strcmp(type, "ACPI Non-volatile Storage") == 0)