mm, memory_hotplug: do not associate hotadded memory to zones until online

[linux-2.6-microblaze.git] / arch / ia64 / mm / init.c

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 39e2aeb..80db57d 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -648,18 +648,11 @@ mem_init (void)
 #ifdef CONFIG_MEMORY_HOTPLUG
 int arch_add_memory(int nid, u64 start, u64 size, bool for_device)
 {
-       pg_data_t *pgdat;
-       struct zone *zone;
        unsigned long start_pfn = start >> PAGE_SHIFT;
        unsigned long nr_pages = size >> PAGE_SHIFT;
        int ret;
 
-       pgdat = NODE_DATA(nid);
-
-       zone = pgdat->node_zones +
-               zone_for_memory(nid, start, size, ZONE_NORMAL, for_device);
-       ret = __add_pages(nid, zone, start_pfn, nr_pages, !for_device);
-
+       ret = __add_pages(nid, start_pfn, nr_pages, !for_device);
        if (ret)
                printk("%s: Problem encountered in __add_pages() as ret=%d\n",
                       __func__,  ret);