diff options
| author |   Bob Picco <bob.picco@hp.com> | 2007-02-13 13:26:25 +0100 |
|---|---|---|
| committer |   Andi Kleen <andi@basil.nowhere.org> | 2007-02-13 13:26:25 +0100 |
| commit | f0a5a58aa812b31fd9f197c4ba48245942364eae (patch) | |
| tree | c423d9d3b40686857d75b78f8da088489678ba3b /arch/x86_64/mm | |
| parent | [PATCH] i386: entry.S END/ENDPROC annotations (diff) | |
| download | linux-dev-f0a5a58aa812b31fd9f197c4ba48245942364eae.tar.xz linux-dev-f0a5a58aa812b31fd9f197c4ba48245942364eae.zip | |
[PATCH] x86-64: clean up sparsemem memory_present call
Eliminate arch specific memory_present call x86_64 NUMA by utilizing
sparse_memory_present_with_active_regions.
Acked-by: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Bob Picco <bob.picco@hp.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/mm')
| -rw-r--r-- | arch/x86_64/mm/numa.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c index d3f747dd61d3..41b8fb069924 100644 --- a/arch/x86_64/mm/numa.c +++ b/arch/x86_64/mm/numa.c @@ -460,20 +460,6 @@ unsigned long __init numa_free_all_bootmem(void) return pages; } -#ifdef CONFIG_SPARSEMEM -static void __init arch_sparse_init(void) -{ - int i; - - for_each_online_node(i) - memory_present(i, node_start_pfn(i), node_end_pfn(i)); - - sparse_init(); -} -#else -#define arch_sparse_init() do {} while (0) -#endif - void __init paging_init(void) { int i; @@ -483,7 +469,8 @@ void __init paging_init(void) max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN; max_zone_pfns[ZONE_NORMAL] = end_pfn; - arch_sparse_init(); + sparse_memory_present_with_active_regions(MAX_NUMNODES); + sparse_init(); for_each_online_node(i) { setup_node_zones(i); |