Re: [PATCH] x86/tools: Drop unlikely definition from insn_decoder_test

From: Shuah Khan
Date: Fri Mar 28 2025 - 17:06:39 EST


On 3/19/25 14:31, Ingo Molnar wrote:

* Nathan Chancellor <nathan@xxxxxxxxxx> wrote:

After commit c104c16073b7 ("Kunit to check the longest symbol length"),
there is a warning when building with clang because there is now a
definition of unlikely from compiler.h in tools/include/linux, which
conflicts with the one in the instruction decoder selftest.

arch/x86/tools/insn_decoder_test.c:15:9: warning: 'unlikely' macro redefined [-Wmacro-redefined]
15 | #define unlikely(cond) (cond)
| ^
tools/include/linux/compiler.h:128:10: note: previous definition is here
128 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
1 warning generated.

Remove the second unlikely definition, as it is no longer necessary,
clearing up the warning.

Fixes: c104c16073b7 ("Kunit to check the longest symbol length")
Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
---
arch/x86/tools/insn_decoder_test.c | 2 --
1 file changed, 2 deletions(-)

I suppose this should be merged into the Kunit tree? The c104c16073b7
commit is in -next currently.

Anyway:

Acked-by: Ingo Molnar <mingo@xxxxxxxxxx>


Thanks Ingo.

David/Brendan, Okay to apply this for the next rc?

thanks,
-- Shuah