lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: let early_reserve_e820 update e820_saved too

Browse Source 
so when it is called after early_param, e820_saved get updated too.
esp for mpc update.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Bernhard Walle <bwalle@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu
2008-07-03 11:39:00 -07:00
committed by Ingo Molnar
parent a0a0becd2d
commit fc9036ea1a
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
arch/x86/kernel/e820.c
View File

@@ -414,8 +414,9 @@ static int __init append_e820_map(struct e820entry *biosmap, int nr_map)
return __append_e820_map(biosmap, nr_map); return __append_e820_map(biosmap, nr_map);
} }
u64 __init e820_update_range(u64 start, u64 size, unsigned old_type, static u64 __init e820_update_range_map(struct e820map *e820x, u64 start,
unsigned new_type) u64 size, unsigned old_type,
unsigned new_type)
{ {
int i; int i;
u64 real_updated_size = 0; u64 real_updated_size = 0;
@@ -426,7 +427,7 @@ u64 __init e820_update_range(u64 start, u64 size, unsigned old_type,
size = ULLONG_MAX - start; size = ULLONG_MAX - start;
for (i = 0; i < e820.nr_map; i++) { for (i = 0; i < e820.nr_map; i++) {
struct e820entry *ei = &e820.map[i]; struct e820entry *ei = &e820x->map[i];
u64 final_start, final_end; u64 final_start, final_end;
if (ei->type != old_type) if (ei->type != old_type)
continue; continue;
@@ -454,6 +455,19 @@ u64 __init e820_update_range(u64 start, u64 size, unsigned old_type,
return real_updated_size; return real_updated_size;
} }
u64 __init e820_update_range(u64 start, u64 size, unsigned old_type,
unsigned new_type)
{
return e820_update_range_map(&e820, start, size, old_type, new_type);
}
static u64 __init e820_update_range_saved(u64 start, u64 size,
unsigned old_type, unsigned new_type)
{
return e820_update_range_map(&e820_saved, start, size, old_type,
new_type);
}
/* make e820 not cover the range */ /* make e820 not cover the range */
u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type, u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type,
int checktype) int checktype)
@@ -503,6 +517,15 @@ void __init update_e820(void)
printk(KERN_INFO "modified physical RAM map:\n"); printk(KERN_INFO "modified physical RAM map:\n");
e820_print_map("modified"); e820_print_map("modified");
} }
static void __init update_e820_saved(void)
{
int nr_map;
nr_map = e820_saved.nr_map;
if (sanitize_e820_map(e820_saved.map, ARRAY_SIZE(e820_saved.map), &nr_map))
return;
e820_saved.nr_map = nr_map;
}
#define MAX_GAP_END 0x100000000ull #define MAX_GAP_END 0x100000000ull
/* /*
* Search for a gap in the e820 memory space from start_addr to end_addr. * Search for a gap in the e820 memory space from start_addr to end_addr.
@@ -1007,8 +1030,10 @@ u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align)
addr = round_down(start + size - sizet, align); addr = round_down(start + size - sizet, align);
e820_update_range(addr, sizet, E820_RAM, E820_RESERVED); e820_update_range(addr, sizet, E820_RAM, E820_RESERVED);
e820_update_range_saved(addr, sizet, E820_RAM, E820_RESERVED);
printk(KERN_INFO "update e820 for early_reserve_e820\n"); printk(KERN_INFO "update e820 for early_reserve_e820\n");
update_e820(); update_e820();
update_e820_saved();
return addr; return addr;
} }