X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fmemory_hotplug.c;h=84279127fcd3ab935f922b4c7e1156bb205d9964;hb=7a13e932281e7042a592f4f14db0b348199e7aac;hp=fd678a662eae1a015ef6393c2b6f23e586592105;hpb=82965addad66fce61a92c5f03104ea90b0b87124;p=powerpc.git diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index fd678a662e..84279127fc 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -67,12 +67,13 @@ static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) zone_type = zone - pgdat->node_zones; if (!populated_zone(zone)) { int ret = 0; - ret = init_currently_empty_zone(zone, phys_start_pfn, nr_pages); + ret = init_currently_empty_zone(zone, phys_start_pfn, + nr_pages, MEMMAP_HOTPLUG); if (ret < 0) return ret; } - memmap_init_zone(nr_pages, nid, zone_type, phys_start_pfn); - zonetable_add(zone, nid, zone_type, phys_start_pfn, nr_pages); + memmap_init_zone(nr_pages, nid, zone_type, + phys_start_pfn, MEMMAP_HOTPLUG); return 0; }