Message ID | 20160728120814.59e42bc8@canb.auug.org.au (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi Michal, > > After merging the kbuild tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > ... > arch/powerpc/mm/hash_utils_64.c:929:10: note: in expansion of macro 'IS_ENABLED' > else if IS_ENABLED(CONFIG_PPC_NATIVE) > ^ > cc1: all warnings being treated as errors > > Caused by commit > > 7353644fa9df ("powerpc/mm: Fix build break when PPC_NATIVE=n") > > from the powerpc tree interacting with commit > > 5e8754fd80b0 ("kconfig.h: allow to use IS_{ENABLE,REACHABLE} in macro expansion") > > from the kbuild tree. **expletive deleted** I was wary of IS_ENABLED(), I should have trusted my instincts. > I have applied the following fix patch (that should be applied to the > powerpc tree): Applied, thanks. cheers
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 1ff11c1bb182..b78b5d211278 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -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)