memblock: use separate iterators for memory and reserved regions

[linux-2.6-microblaze.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 34ac712..05fe1dd 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5961,7 +5961,7 @@ overlap_memmap_init(unsigned long zone, unsigned long *pfn)
 
        if (mirrored_kernelcore && zone == ZONE_MOVABLE) {
                if (!r || *pfn >= memblock_region_memory_end_pfn(r)) {
-                       for_each_memblock(memory, r) {
+                       for_each_mem_region(r) {
                                if (*pfn < memblock_region_memory_end_pfn(r))
                                        break;
                        }
@@ -6546,7 +6546,7 @@ static unsigned long __init zone_absent_pages_in_node(int nid,
                unsigned long start_pfn, end_pfn;
                struct memblock_region *r;
 
-               for_each_memblock(memory, r) {
+               for_each_mem_region(r) {
                        start_pfn = clamp(memblock_region_memory_base_pfn(r),
                                          zone_start_pfn, zone_end_pfn);
                        end_pfn = clamp(memblock_region_memory_end_pfn(r),
@@ -7140,7 +7140,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)
         * options.
         */
        if (movable_node_is_enabled()) {
-               for_each_memblock(memory, r) {
+               for_each_mem_region(r) {
                        if (!memblock_is_hotpluggable(r))
                                continue;
 
@@ -7161,7 +7161,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)
        if (mirrored_kernelcore) {
                bool mem_below_4gb_not_mirrored = false;
 
-               for_each_memblock(memory, r) {
+               for_each_mem_region(r) {
                        if (memblock_is_mirror(r))
                                continue;