[PATCH 4/5] powerpc: wii: Don't rely on the reserved memory hack

[Jonathan Neuschäfer]

Signed-off-by: Jonathan Neuschäfer 
---
 arch/powerpc/platforms/embedded6xx/wii.c | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c 
b/arch/powerpc/platforms/embedded6xx/wii.c
index 4682327f76a9..fc00d82691e1 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -81,21 +81,9 @@ void __init wii_memory_fixups(void)
BUG_ON(memblock.memory.cnt != 2);
BUG_ON(!page_aligned(p[0].base) || !page_aligned(p[1].base));
 
-   /* trim unaligned tail */
-   memblock_remove(ALIGN(p[1].base + p[1].size, PAGE_SIZE),
-   (phys_addr_t)ULLONG_MAX);
-
-   /* determine hole, add & reserve them */
+   /* determine hole */
wii_hole_start = ALIGN(p[0].base + p[0].size, PAGE_SIZE);
wii_hole_size = p[1].base - wii_hole_start;
-   memblock_add(wii_hole_start, wii_hole_size);
-   memblock_reserve(wii_hole_start, wii_hole_size);
-
-   BUG_ON(memblock.memory.cnt != 1);
-   __memblock_dump_all();
-
-   /* allow ioremapping the address space in the hole */
-   __allow_ioremap_reserved = 1;
 }
 
 unsigned long __init wii_mmu_mapin_mem2(unsigned long top)
-- 
2.16.1

[PATCH 4/5] powerpc: wii: Don't rely on the reserved memory hack

[Jonathan Neuschäfer]

Signed-off-by: Jonathan Neuschäfer 
---
 arch/powerpc/platforms/embedded6xx/wii.c | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c 
b/arch/powerpc/platforms/embedded6xx/wii.c
index 4682327f76a9..fc00d82691e1 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -81,21 +81,9 @@ void __init wii_memory_fixups(void)
BUG_ON(memblock.memory.cnt != 2);
BUG_ON(!page_aligned(p[0].base) || !page_aligned(p[1].base));
 
-   /* trim unaligned tail */
-   memblock_remove(ALIGN(p[1].base + p[1].size, PAGE_SIZE),
-   (phys_addr_t)ULLONG_MAX);
-
-   /* determine hole, add & reserve them */
+   /* determine hole */
wii_hole_start = ALIGN(p[0].base + p[0].size, PAGE_SIZE);
wii_hole_size = p[1].base - wii_hole_start;
-   memblock_add(wii_hole_start, wii_hole_size);
-   memblock_reserve(wii_hole_start, wii_hole_size);
-
-   BUG_ON(memblock.memory.cnt != 1);
-   __memblock_dump_all();
-
-   /* allow ioremapping the address space in the hole */
-   __allow_ioremap_reserved = 1;
 }
 
 unsigned long __init wii_mmu_mapin_mem2(unsigned long top)
-- 
2.16.1