diff options
Diffstat (limited to 'arch/x86/kernel/e820.c')
-rw-r--r-- | arch/x86/kernel/e820.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index ba5ac880ea1e..e03b89ac8f2b 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
@@ -120,6 +120,7 @@ void __init e820_print_map(char *who) | |||
120 | (e820.map[i].addr + e820.map[i].size)); | 120 | (e820.map[i].addr + e820.map[i].size)); |
121 | switch (e820.map[i].type) { | 121 | switch (e820.map[i].type) { |
122 | case E820_RAM: | 122 | case E820_RAM: |
123 | case E820_RESERVED_KERN: | ||
123 | printk(KERN_CONT "(usable)\n"); | 124 | printk(KERN_CONT "(usable)\n"); |
124 | break; | 125 | break; |
125 | case E820_RESERVED: | 126 | case E820_RESERVED: |
@@ -611,7 +612,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) | |||
611 | register_nosave_region(pfn, PFN_UP(ei->addr)); | 612 | register_nosave_region(pfn, PFN_UP(ei->addr)); |
612 | 613 | ||
613 | pfn = PFN_DOWN(ei->addr + ei->size); | 614 | pfn = PFN_DOWN(ei->addr + ei->size); |
614 | if (ei->type != E820_RAM) | 615 | if (ei->type != E820_RAM && ei->type != E820_RESERVED_KERN) |
615 | register_nosave_region(PFN_UP(ei->addr), pfn); | 616 | register_nosave_region(PFN_UP(ei->addr), pfn); |
616 | 617 | ||
617 | if (pfn >= limit_pfn) | 618 | if (pfn >= limit_pfn) |
@@ -1207,6 +1208,7 @@ void __init e820_reserve_resources(void) | |||
1207 | res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map); | 1208 | res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map); |
1208 | for (i = 0; i < e820.nr_map; i++) { | 1209 | for (i = 0; i < e820.nr_map; i++) { |
1209 | switch (e820.map[i].type) { | 1210 | switch (e820.map[i].type) { |
1211 | case E820_RESERVED_KERN: | ||
1210 | case E820_RAM: res->name = "System RAM"; break; | 1212 | case E820_RAM: res->name = "System RAM"; break; |
1211 | case E820_ACPI: res->name = "ACPI Tables"; break; | 1213 | case E820_ACPI: res->name = "ACPI Tables"; break; |
1212 | case E820_NVS: res->name = "ACPI Non-volatile Storage"; break; | 1214 | case E820_NVS: res->name = "ACPI Non-volatile Storage"; break; |