powerpc/mm/32s: use generic mmu_mapin_ram() for all blocks.

Now that mmu_mapin_ram() is able to handle other blocks
than the one starting at 0, the WII can use it for all
its blocks.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index b4858818523ff7b2092fa4ed67b75110b3bf39ff..c4b0eb51f6d80939800592ee75d43ab93170dbf8 100644 (file)
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -254,26 +254,17 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top)
 
 void __init mapin_ram(void)
 {
-       unsigned long s, top;
-
-#ifndef CONFIG_WII
-       top = total_lowmem;
-       s = mmu_mapin_ram(0, top);
-       __mapin_ram_chunk(s, top);
-#else
-       if (!wii_hole_size) {
-               s = mmu_mapin_ram(0, total_lowmem);
-               __mapin_ram_chunk(s, total_lowmem);
-       } else {
-               top = wii_hole_start;
-               s = mmu_mapin_ram(0, top);
-               __mapin_ram_chunk(s, top);
+       struct memblock_region *reg;
+
+       for_each_memblock(memory, reg) {
+               phys_addr_t base = reg->base;
+               phys_addr_t top = min(base + reg->size, total_lowmem);
 
-               top = memblock_end_of_DRAM();
-               s = wii_mmu_mapin_mem2(top);
-               __mapin_ram_chunk(s, top);
+               if (base >= top)
+                       continue;
+               base = mmu_mapin_ram(base, top);
+               __mapin_ram_chunk(base, top);
        }
-#endif
 }
 
 /* Scan the real Linux page tables and return a PTE pointer for