1 files changed, 11 insertions, 1 deletions

diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index 4b66a1ece6d..cde270847e7 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -40,6 +40,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/highmem.h>
+#include <linux/memblock.h>
 
 #include <asm/pgalloc.h>
 #include <asm/prom.h>
@@ -213,5 +214,14 @@ void __init adjust_total_lowmem(void)
         pr_cont("%lu Mb, residual: %dMb\n", tlbcam_sz(tlbcam_index - 1) >> 20,
                 (unsigned int)((total_lowmem - __max_low_memory) >> 20));
 
-        __initial_memory_limit_addr = memstart_addr + __max_low_memory;
+        memblock_set_current_limit(memstart_addr + __max_low_memory);
+}
+
+void setup_initial_memory_limit(phys_addr_t first_memblock_base,
+                                phys_addr_t first_memblock_size)
+{
+        phys_addr_t limit = first_memblock_base + first_memblock_size;
+
+        /* 64M mapped initially according to head_fsl_booke.S */
+        memblock_set_current_limit(min_t(u64, limit, 0x04000000));
 }