37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From b40bdfdcffa333ad169327c5b8fe1b93542c7e0a Mon Sep 17 00:00:00 2001
|
|
From: Nathan Chancellor <nathan@kernel.org>
|
|
Date: Tue, 18 Mar 2025 15:32:30 -0700
|
|
Subject: x86/tools: Drop duplicate unlikely() definition in
|
|
insn_decoder_test.c
|
|
|
|
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 | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
--- a/arch/x86/tools/insn_decoder_test.c
|
|
+++ b/arch/x86/tools/insn_decoder_test.c
|
|
@@ -11,8 +11,6 @@
|
|
#include <unistd.h>
|
|
#include <stdarg.h>
|
|
|
|
-#define unlikely(cond) (cond)
|
|
-
|
|
#include <asm/insn.h>
|
|
#include <inat.c>
|
|
#include <insn.c>
|