3 files changed, 3 insertions, 2 deletions

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index d366051e14fe..786adddf1a86 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -381,8 +381,6 @@ void __init bootmem_init(void)
          */
         arm_bootmem_free(min, max_low, max_high);
 
-        high_memory = __va(((phys_addr_t)max_low << PAGE_SHIFT) - 1) + 1;
-
         /*
          * This doesn't seem to be used by the Linux memory manager any
          * more, but is used by ll_rw_block.  If we can get rid of it, we
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index dc8c550e6cbd..0aa8b7d5b21d 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -860,6 +860,7 @@ void __init sanity_check_meminfo(void)
         }
 #endif
         meminfo.nr_banks = j;
+        high_memory = __va(lowmem_limit - 1) + 1;
         memblock_set_current_limit(lowmem_limit);
 }
 
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index 941a98c9e8aa..9348730a6ba5 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -29,6 +29,8 @@ void __init arm_mm_memblock_reserve(void)
 
 void __init sanity_check_meminfo(void)
 {
+        phys_addr_t end = bank_phys_end(&meminfo.bank[meminfo.nr_banks - 1]);
+        high_memory = __va(end - 1) + 1;
 }
 
 /*