diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-01 03:20:54 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 15:16:14 +0400 |
| commit | 28bb22379513ca3cac9d13766064a219c5fc21a9 (patch) | |
| tree | e9b870bf99adbbb58e13c454a78366ff83292982 /arch/x86/kernel/e820.c | |
| parent | 102d0a4b56d94e9b7eedfdfb488400271235543f (diff) | |
| download | linux-28bb22379513ca3cac9d13766064a219c5fc21a9.tar.xz | |
x86: move reserve_setup_data to setup.c
Ying Huang would like setup_data to be reserved, but not included in the
no save range.
Here we try to modify the e820 table to reserve that range early.
also add that in early_res in case bootloader messes up with the ramdisk.
other solution would be
1. add early_res_to_highmem...
2. early_res_to_e820...
but they could reserve another type memory wrongly, if early_res has some
resource reserved early, and not needed later, but it is not removed from
early_res in time. Like the RAMDISK (already handled).
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: andi@firstfloor.org
Tested-by: Huang, Ying <ying.huang@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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) (e820.map[i].addr + e820.map[i].size)); switch (e820.map[i].type) { case E820_RAM: + case E820_RESERVED_KERN: printk(KERN_CONT "(usable)\n"); break; case E820_RESERVED: @@ -611,7 +612,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) register_nosave_region(pfn, PFN_UP(ei->addr)); pfn = PFN_DOWN(ei->addr + ei->size); - if (ei->type != E820_RAM) + if (ei->type != E820_RAM && ei->type != E820_RESERVED_KERN) register_nosave_region(PFN_UP(ei->addr), pfn); if (pfn >= limit_pfn) @@ -1207,6 +1208,7 @@ void __init e820_reserve_resources(void) res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map); for (i = 0; i < e820.nr_map; i++) { switch (e820.map[i].type) { + case E820_RESERVED_KERN: case E820_RAM: res->name = "System RAM"; break; case E820_ACPI: res->name = "ACPI Tables"; break; case E820_NVS: res->name = "ACPI Non-volatile Storage"; break; |