samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/tools: Drop duplicate unlikely() definition in insn_decoder_test.c

Browse Source 
commit f710202b2a45addea3dcdcd862770ecbaf6597ef upstream.

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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nathan Chancellor
2025-03-18 15:32:30 -07:00
committed by Greg Kroah-Hartman
parent ed1f395ea5
commit 1583d908cc
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/tools/insn_decoder_test.c
View File

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