Skip to content

Commit b5fa0f7

Browse files
committed
powerpc: Fix build failure with clang due to BUILD_BUG_ON()
Anton says: In commit 4db7327 ("powerpc: Add option to use jump label for cpu_has_feature()") and commit c12e6f2 ("powerpc: Add option to use jump label for mmu_has_feature()") we added: BUILD_BUG_ON(!__builtin_constant_p(feature)) to cpu_has_feature() and mmu_has_feature() in order to catch usage issues (such as cpu_has_feature(cpu_has_feature(X), which has happened once in the past). Unfortunately LLVM isn't smart enough to resolve this, and it errors out. I work around it in my clang/LLVM builds of the kernel, but I have just discovered that it causes a lot of issues for the bcc (eBPF) trace tool (which uses LLVM). For now just #ifdef it away for clang builds. Fixes: 4db7327 ("powerpc: Add option to use jump label for cpu_has_feature()") Fixes: c12e6f2 ("powerpc: Add option to use jump label for mmu_has_feature()") Cc: stable@vger.kernel.org # v4.8+ Reported-by: Anton Blanchard <anton@samba.org> Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
1 parent f257403 commit b5fa0f7

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

arch/powerpc/include/asm/cpu_has_feature.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ static __always_inline bool cpu_has_feature(unsigned long feature)
2323
{
2424
int i;
2525

26+
#ifndef __clang__ /* clang can't cope with this */
2627
BUILD_BUG_ON(!__builtin_constant_p(feature));
28+
#endif
2729

2830
#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG
2931
if (!static_key_initialized) {

arch/powerpc/include/asm/mmu.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ static __always_inline bool mmu_has_feature(unsigned long feature)
160160
{
161161
int i;
162162

163+
#ifndef __clang__ /* clang can't cope with this */
163164
BUILD_BUG_ON(!__builtin_constant_p(feature));
165+
#endif
164166

165167
#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG
166168
if (!static_key_initialized) {

0 commit comments

Comments
 (0)