Merge tag 'powerpc-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-block.git] / arch / powerpc / kernel / prom_init.c

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 0ef358285337412f14dcf073282bca863dc88949..fbb68fc28ed3a534be5b42214fa0c0fdba5ba4ca 100644 (file)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -817,8 +817,8 @@ static void __init early_cmdline_parse(void)
                opt += 4;
                prom_memory_limit = prom_memparse(opt, (const char **)&opt);
 #ifdef CONFIG_PPC64
-               /* Align to 16 MB == size of ppc64 large page */
-               prom_memory_limit = ALIGN(prom_memory_limit, 0x1000000);
+               /* Align down to 16 MB which is large page size with hash page translation */
+               prom_memory_limit = ALIGN_DOWN(prom_memory_limit, SZ_16M);
 #endif
        }