From 8853ae9f03e9fa09c2b1ca60680fe5d35e6d9689 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 8 Dec 2011 10:22:08 -0800
Subject: [PATCH] --- yaml --- r: 277179 b: refs/heads/master c:
 98e4ae8af0055816747d1e8ad727f69bbfd9f7d0 h: refs/heads/master i:   277177:
 b8c6b8f829149c8945a5e6208e8a6f1d20d099d9   277175:
 5a840cd6f592f8bc6ac633b6bccbbd0cb0e0b742 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/ia64/Kconfig     | 3 +++
 trunk/arch/ia64/mm/contig.c | 3 ++-
 trunk/arch/ia64/mm/init.c   | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1a20a0098c1f..f41453cbfa7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 534cfbee295222e188c391db5187ca9a6ab0c035
+refs/heads/master: 98e4ae8af0055816747d1e8ad727f69bbfd9f7d0
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 27489b6dd533..e2c7de0d823d 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -23,6 +23,9 @@ config IA64
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_DMA_API_DEBUG
 	select HAVE_GENERIC_HARDIRQS
+	select HAVE_MEMBLOCK
+	select HAVE_MEMBLOCK_NODE_MAP
+	select ARCH_DISCARD_MEMBLOCK
 	select GENERIC_IRQ_PROBE
 	select GENERIC_PENDING_IRQ if SMP
 	select IRQ_PER_CPU
diff --git a/trunk/arch/ia64/mm/contig.c b/trunk/arch/ia64/mm/contig.c
index f114a3b14c6a..1516d1dc11fd 100644
--- a/trunk/arch/ia64/mm/contig.c
+++ b/trunk/arch/ia64/mm/contig.c
@@ -16,6 +16,7 @@
  */
 #include <linux/bootmem.h>
 #include <linux/efi.h>
+#include <linux/memblock.h>
 #include <linux/mm.h>
 #include <linux/nmi.h>
 #include <linux/swap.h>
@@ -348,7 +349,7 @@ paging_init (void)
 		printk("Virtual mem_map starts at 0x%p\n", mem_map);
 	}
 #else /* !CONFIG_VIRTUAL_MEM_MAP */
-	add_active_range(0, 0, max_low_pfn);
+	memblock_add_node(0, PFN_PHYS(max_low_pfn), 0);
 	free_area_init_nodes(max_zone_pfns);
 #endif /* !CONFIG_VIRTUAL_MEM_MAP */
 	zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
diff --git a/trunk/arch/ia64/mm/init.c b/trunk/arch/ia64/mm/init.c
index 00cb0e26c64e..13df239dbed1 100644
--- a/trunk/arch/ia64/mm/init.c
+++ b/trunk/arch/ia64/mm/init.c
@@ -10,6 +10,7 @@
 #include <linux/bootmem.h>
 #include <linux/efi.h>
 #include <linux/elf.h>
+#include <linux/memblock.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/module.h>
@@ -557,8 +558,7 @@ int __init register_active_ranges(u64 start, u64 len, int nid)
 #endif
 
 	if (start < end)
-		add_active_range(nid, __pa(start) >> PAGE_SHIFT,
-			__pa(end) >> PAGE_SHIFT);
+		memblock_add_node(__pa(start), end - start, nid);
 	return 0;
 }