1 files changed, 9 insertions, 5 deletions

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 6894ef3e6234..f4f8b500f74c 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -202,7 +202,7 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
 }
 
 static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
-                                  unsigned long end, unsigned long phys,
+                                  unsigned long end, phys_addr_t phys,
                                   int map_io)
 {
         pud_t *pud;
@@ -297,11 +297,15 @@ static void __init map_mem(void)
          * create_mapping requires puds, pmds and ptes to be allocated from
          * memory addressable from the initial direct kernel mapping.
          *
-         * The initial direct kernel mapping, located at swapper_pg_dir,
-         * gives us PUD_SIZE memory starting from PHYS_OFFSET (which must be
-         * aligned to 2MB as per Documentation/arm64/booting.txt).
+         * The initial direct kernel mapping, located at swapper_pg_dir, gives
+         * us PUD_SIZE (4K pages) or PMD_SIZE (64K pages) memory starting from
+         * PHYS_OFFSET (which must be aligned to 2MB as per
+         * Documentation/arm64/booting.txt).
          */
-        limit = PHYS_OFFSET + PUD_SIZE;
+        if (IS_ENABLED(CONFIG_ARM64_64K_PAGES))
+                limit = PHYS_OFFSET + PMD_SIZE;
+        else
+                limit = PHYS_OFFSET + PUD_SIZE;
         memblock_set_current_limit(limit);
 
         /* map all the memory banks */