]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/tools: Drop duplicate unlikely() definition in insn_decoder_test.c
authorNathan Chancellor <nathan@kernel.org>
Tue, 18 Mar 2025 22:32:30 +0000 (15:32 -0700)
committerIngo Molnar <mingo@kernel.org>
Fri, 28 Mar 2025 21:57:44 +0000 (22:57 +0100)
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]

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@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20250318-x86-decoder-test-fix-unlikely-redef-v1-1-74c84a7bf05b@kernel.org
arch/x86/tools/insn_decoder_test.c

index 6c2986d2ad117403571af1e3a713abb6eddc2e0a..08cd913cbd4e9a75eed12b97de2208524933edb6 100644 (file)
@@ -12,8 +12,6 @@
 #include <stdarg.h>
 #include <linux/kallsyms.h>
 
-#define unlikely(cond) (cond)
-
 #include <asm/insn.h>
 #include <inat.c>
 #include <insn.c>