From d86722f3f63de2470f37bed990ffb627bf08b9e3 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 3 Jul 2008 11:35:37 -0700 Subject: [PATCH] --- yaml --- r: 100009 b: refs/heads/master c: 0be15526beb4c228e0477221c62ec8ab0fc7440f h: refs/heads/master i: 100007: 9f635620f42ead5c2820dd0712638c08a5705dda v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/e820.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6fa3dda3dfaf..4c58eb75183a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dfcf14d5b28174f94cbe9b4fb35d415db61c64a +refs/heads/master: 0be15526beb4c228e0477221c62ec8ab0fc7440f diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c index fc1d579f212b..13e32986cb5f 100644 --- a/trunk/arch/x86/kernel/e820.c +++ b/trunk/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