From 6640e9b0319f1f1e4c4e407430f87c6f0cccc2de Mon Sep 17 00:00:00 2001
From: Bob Picco <bob.picco@hp.com>
Date: Mon, 5 Feb 2007 16:20:08 -0800
Subject: [PATCH] --- yaml --- r: 46261 b: refs/heads/master c:
 524fd988bb83153ddc9cfea867129eb6efb7ac23 h: refs/heads/master i:   46259:
 5af4f9435f5b6b039030bf8ee6d309b042264d16 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/ia64/mm/discontig.c | 36 +++-------------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/[refs] b/[refs]
index 6252f987129d..e4aca0e1b52d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1c0afa2e8802c01cf82c915e2bb3cb2a81570d4
+refs/heads/master: 524fd988bb83153ddc9cfea867129eb6efb7ac23
diff --git a/trunk/arch/ia64/mm/discontig.c b/trunk/arch/ia64/mm/discontig.c
index 999cefd2b226..6eae596c509d 100644
--- a/trunk/arch/ia64/mm/discontig.c
+++ b/trunk/arch/ia64/mm/discontig.c
@@ -412,37 +412,6 @@ static void __init memory_less_nodes(void)
 	return;
 }
 
-#ifdef CONFIG_SPARSEMEM
-/**
- * register_sparse_mem - notify SPARSEMEM that this memory range exists.
- * @start: physical start of range
- * @end: physical end of range
- * @arg: unused
- *
- * Simply calls SPARSEMEM to register memory section(s).
- */
-static int __init register_sparse_mem(unsigned long start, unsigned long end,
-	void *arg)
-{
-	int nid;
-
-	start = __pa(start) >> PAGE_SHIFT;
-	end = __pa(end) >> PAGE_SHIFT;
-	nid = early_pfn_to_nid(start);
-	memory_present(nid, start, end);
-
-	return 0;
-}
-
-static void __init arch_sparse_init(void)
-{
-	efi_memmap_walk(register_sparse_mem, NULL);
-	sparse_init();
-}
-#else
-#define arch_sparse_init() do {} while (0)
-#endif
-
 /**
  * find_memory - walk the EFI memory map and setup the bootmem allocator
  *
@@ -694,10 +663,11 @@ void __init paging_init(void)
 
 	max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;
 
-	arch_sparse_init();
-
 	efi_memmap_walk(filter_rsvd_memory, count_node_pages);
 
+	sparse_memory_present_with_active_regions(MAX_NUMNODES);
+	sparse_init();
+
 #ifdef CONFIG_VIRTUAL_MEM_MAP
 	vmalloc_end -= PAGE_ALIGN(ALIGN(max_low_pfn, MAX_ORDER_NR_PAGES) *
 		sizeof(struct page));