diff options
-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 fc1d579f212b..13e32986cb5f 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) | |||
1294 | e820_add_region(HIGH_MEMORY, mem_size << 10, E820_RAM); | 1294 | e820_add_region(HIGH_MEMORY, mem_size << 10, E820_RAM); |
1295 | } | 1295 | } |
1296 | 1296 | ||
1297 | memcpy(&e820_saved, &e820, sizeof(struct e820map)); | ||
1298 | |||
1299 | /* In case someone cares... */ | 1297 | /* In case someone cares... */ |
1300 | return who; | 1298 | return who; |
1301 | } | 1299 | } |
@@ -1313,8 +1311,12 @@ char * __init __attribute__((weak)) memory_setup(void) | |||
1313 | 1311 | ||
1314 | void __init setup_memory_map(void) | 1312 | void __init setup_memory_map(void) |
1315 | { | 1313 | { |
1314 | char *who; | ||
1315 | |||
1316 | who = memory_setup(); | ||
1317 | memcpy(&e820_saved, &e820, sizeof(struct e820map)); | ||
1316 | printk(KERN_INFO "BIOS-provided physical RAM map:\n"); | 1318 | printk(KERN_INFO "BIOS-provided physical RAM map:\n"); |
1317 | e820_print_map(memory_setup()); | 1319 | e820_print_map(who); |
1318 | } | 1320 | } |
1319 | 1321 | ||
1320 | #ifdef CONFIG_X86_64 | 1322 | #ifdef CONFIG_X86_64 |