powerpc/mm: Eliminate unneeded for_each_memblock

The only persistent change made by this loop is calling
memblock_set_node() once for each memblock, which is not useful (and has
no effect) as memblock_set_node() is not called with any
memblock-specific parameters.

Subsistute a single memblock_set_node().

Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 4 insertions, 7 deletions

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 0dba5066c22a..40df7c8f2096 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -195,13 +195,10 @@ void __init do_init_bootmem(void)
         min_low_pfn = MEMORY_START >> PAGE_SHIFT;
         boot_mapsize = init_bootmem_node(NODE_DATA(0), start >> PAGE_SHIFT, min_low_pfn, max_low_pfn);
 
-        /* Add active regions with valid PFNs */
-        for_each_memblock(memory, reg) {
-                unsigned long start_pfn, end_pfn;
-                start_pfn = memblock_region_memory_base_pfn(reg);
-                end_pfn = memblock_region_memory_end_pfn(reg);
-                memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0);
-        }
+        /* Place all memblock_regions in the same node and merge contiguous
+         * memblock_regions
+         */
+        memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0);
 
         /* Add all physical memory to the bootmem map, mark each area
          * present.