diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-04-15 20:29:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:55 -0400 |
commit | fa5c4639419668cbb18ca3d20c1253559a3b43ae (patch) | |
tree | d811ff66fad6baa886157b6d94ed0801c39f43f6 /arch/x86/kernel | |
parent | d8bb6f4c1670c8324e4135c61ef07486f7f17379 (diff) |
x86: rename find_max_pfn() to propagate_e820_map()
this function doesnt just 'find' the max_pfn - it also has
other side-effects such as registering sparse memory maps.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/e820_32.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/setup_32.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c index 0240cd778365..ed733e7cf4e6 100644 --- a/arch/x86/kernel/e820_32.c +++ b/arch/x86/kernel/e820_32.c | |||
@@ -475,7 +475,7 @@ int __init copy_e820_map(struct e820entry *biosmap, int nr_map) | |||
475 | /* | 475 | /* |
476 | * Find the highest page frame number we have available | 476 | * Find the highest page frame number we have available |
477 | */ | 477 | */ |
478 | void __init find_max_pfn(void) | 478 | void __init propagate_e820_map(void) |
479 | { | 479 | { |
480 | int i; | 480 | int i; |
481 | 481 | ||
@@ -704,7 +704,7 @@ static int __init parse_memmap(char *arg) | |||
704 | * size before original memory map is | 704 | * size before original memory map is |
705 | * reset. | 705 | * reset. |
706 | */ | 706 | */ |
707 | find_max_pfn(); | 707 | propagate_e820_map(); |
708 | saved_max_pfn = max_pfn; | 708 | saved_max_pfn = max_pfn; |
709 | #endif | 709 | #endif |
710 | e820.nr_map = 0; | 710 | e820.nr_map = 0; |
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 5b0bffb7fcc9..1c4799e68718 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -812,10 +812,10 @@ void __init setup_arch(char **cmdline_p) | |||
812 | efi_init(); | 812 | efi_init(); |
813 | 813 | ||
814 | /* update e820 for memory not covered by WB MTRRs */ | 814 | /* update e820 for memory not covered by WB MTRRs */ |
815 | find_max_pfn(); | 815 | propagate_e820_map(); |
816 | mtrr_bp_init(); | 816 | mtrr_bp_init(); |
817 | if (mtrr_trim_uncached_memory(max_pfn)) | 817 | if (mtrr_trim_uncached_memory(max_pfn)) |
818 | find_max_pfn(); | 818 | propagate_e820_map(); |
819 | 819 | ||
820 | max_low_pfn = setup_memory(); | 820 | max_low_pfn = setup_memory(); |
821 | 821 | ||