diff options
| author |   Joe Perches <joe@perches.com> | 2020-06-05 07:18:06 -0700 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2020-06-22 10:37:58 +1000 |
| commit | 55bd9ac468397c4f12a33b7ec714b5d0362c3aa2 (patch) | |
| tree | 779a1f2be06b08f0575ceeb45910a2a7a41680be /arch/powerpc/mm/book3s64/hash_utils.c | |
| parent | powerpc/xive: Ignore kmemleak false positives (diff) | |
| download | linux-dev-55bd9ac468397c4f12a33b7ec714b5d0362c3aa2.tar.xz linux-dev-55bd9ac468397c4f12a33b7ec714b5d0362c3aa2.zip | |
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: 970d54f99cea ("powerpc/book3s64/hash: Disable 16M linear mapping size if not aligned")
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/202006050717.A2F9809E@keescook
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/mm/book3s64/hash_utils.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index 468169e33c86..084287fb2908 100644 --- a/arch/powerpc/mm/book3s64/hash_utils.c +++ b/arch/powerpc/mm/book3s64/hash_utils.c @@ -663,11 +663,10 @@ static void __init htab_init_page_sizes(void) * Pick a size for the linear mapping. Currently, we only * 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) { if (mmu_psize_defs[MMU_PAGE_16M].shift) - pr_warn("Kernel not 16M aligned, " - "disabling 16M linear map alignment"); + pr_warn("Kernel not 16M aligned, disabling 16M linear map alignment\n"); aligned = false; } |