diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-03 11:35:37 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 07:43:21 +0200 |
| commit | 0be15526beb4c228e0477221c62ec8ab0fc7440f (patch) | |
| tree | 2ef7b2c3273a4835135d4ab1cc7088ee59754c2b /arch/x86/kernel | |
| parent | 5dfcf14d5b28174f94cbe9b4fb35d415db61c64a (diff) | |
x86: move saving e820_saved to setup_memory_map
so other path that will override memory_setup or
machine_specific_memory_setup could have e820_saved too.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Bernhard Walle <bwalle@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/e820.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index fc1d579f212..13e32986cb5 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -1294,8 +1294,6 @@ char *__init default_machine_specific_memory_setup(void) e820_add_region(HIGH_MEMORY, mem_size << 10, E820_RAM); } - memcpy(&e820_saved, &e820, sizeof(struct e820map)); - /* In case someone cares... */ return who; } @@ -1313,8 +1311,12 @@ char * __init __attribute__((weak)) memory_setup(void) void __init setup_memory_map(void) { + char *who; + + who = memory_setup(); + memcpy(&e820_saved, &e820, sizeof(struct e820map)); printk(KERN_INFO "BIOS-provided physical RAM map:\n"); - e820_print_map(memory_setup()); + e820_print_map(who); } #ifdef CONFIG_X86_64 |