powerpc/mm: Parenthesise IS_ENABLED() in if condition
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2016 02:35:02 +0000 (12:35 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 28 Jul 2016 02:39:15 +0000 (12:39 +1000)
Currently IS_ENABLED() produces an expression surrounded by parentheses,
which allows this code to compile, generating eg:

    else if (1 || 0)
        hpte_init_native();

However a change to the macro in the kbuild tree will break this in
future by removing the parentheses.

Fixes: 7353644fa9df ("powerpc/mm: Fix build break when PPC_NATIVE=n")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/mm/hash_utils_64.c

index 1ff11c1..b78b5d2 100644 (file)
@@ -926,7 +926,7 @@ void __init hash__early_init_mmu(void)
                ps3_early_mm_init();
        else if (firmware_has_feature(FW_FEATURE_LPAR))
                hpte_init_pseries();
-       else if IS_ENABLED(CONFIG_PPC_NATIVE)
+       else if (IS_ENABLED(CONFIG_PPC_NATIVE))
                hpte_init_native();
 
        if (!mmu_hash_ops.hpte_insert)