powerpc/64s: Fix stress_hpt memblock alloc alignment

The stress_hpt memblock allocation did not pass in an alignment,
which causes a stack dump in early boot (that I missed, oops).

Fixes: 6b34a099faa1 ("powerpc/64s/hash: add stress_hpt kernel boot option to increase hash faults")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20221216115930.2667772-2-npiggin@gmail.com

diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
index 80a148c57de8137aba48022373d3475a567c219f..fa1c148e1f50b0ba6c98b393dd1e650b0ef15e4d 100644 (file)
--- a/arch/powerpc/mm/book3s64/hash_utils.c
+++ b/arch/powerpc/mm/book3s64/hash_utils.c
@@ -1051,7 +1051,8 @@ static void __init htab_initialize(void)
                static_branch_enable(&stress_hpt_key);
                // Too early to use nr_cpu_ids, so use NR_CPUS
                tmp = memblock_phys_alloc_range(sizeof(struct stress_hpt_struct) * NR_CPUS,
-                                               0, 0, MEMBLOCK_ALLOC_ANYWHERE);
+                                               __alignof__(struct stress_hpt_struct),
+                                               0, MEMBLOCK_ALLOC_ANYWHERE);
                memset((void *)tmp, 0xff, sizeof(struct stress_hpt_struct) * NR_CPUS);
                stress_hpt_struct = __va(tmp);