Commit 55bd9ac4 authored by Joe Perches's avatar Joe Perches Committed by Michael Ellerman

powerpc/mm: Fix typo in IS_ENABLED()

IS_ENABLED() matches names exactly, so the missing "CONFIG_" prefix
means this code would never be built.

Also fixes a missing newline in pr_warn().

Fixes: 970d54f9 ("powerpc/book3s64/hash: Disable 16M linear mapping size if not aligned")
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/202006050717.A2F9809E@keescook
parent f0993c83
...@@ -663,11 +663,10 @@ static void __init htab_init_page_sizes(void) ...@@ -663,11 +663,10 @@ static void __init htab_init_page_sizes(void)
* Pick a size for the linear mapping. Currently, we only * Pick a size for the linear mapping. Currently, we only
* support 16M, 1M and 4K which is the default * support 16M, 1M and 4K which is the default
*/ */
if (IS_ENABLED(STRICT_KERNEL_RWX) && if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) &&
(unsigned long)_stext % 0x1000000) { (unsigned long)_stext % 0x1000000) {
if (mmu_psize_defs[MMU_PAGE_16M].shift) if (mmu_psize_defs[MMU_PAGE_16M].shift)
pr_warn("Kernel not 16M aligned, " pr_warn("Kernel not 16M aligned, disabling 16M linear map alignment\n");
"disabling 16M linear map alignment");
aligned = false; aligned = false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment