Skip to content

Commit

Permalink
x86: move saving e820_saved to setup_memory_map
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Jul 9, 2008
1 parent 5dfcf14 commit 0be1552
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions arch/x86/kernel/e820.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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
Expand Down

0 comments on commit 0be1552

Please sign in to comment.