linux-kernel - [tip: x86/urgent] x86/tools: Drop duplicate unlikely() definition in insn_decoder

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <174319948509.14745.3479499949306417575.tip-bot2@tip-bot2>
Date: Fri, 28 Mar 2025 22:04:45 -0000
From: "tip-bot2 for Nathan Chancellor" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Nathan Chancellor <nathan@...nel.org>, Ingo Molnar <mingo@...nel.org>,
 Shuah Khan <skhan@...uxfoundation.org>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: x86/urgent] x86/tools: Drop duplicate unlikely() definition in
 insn_decoder_test.c

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     f710202b2a45addea3dcdcd862770ecbaf6597ef
Gitweb:        https://git.kernel.org/tip/f710202b2a45addea3dcdcd862770ecbaf6597ef
Author:        Nathan Chancellor <nathan@...nel.org>
AuthorDate:    Tue, 18 Mar 2025 15:32:30 -07:00
Committer:     Ingo Molnar <mingo@...nel.org>
CommitterDate: Fri, 28 Mar 2025 22:57:44 +01:00

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@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Acked-by: Shuah Khan <skhan@...uxfoundation.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(-)

diff --git a/arch/x86/tools/insn_decoder_test.c b/arch/x86/tools/insn_decoder_test.c
index 6c2986d..08cd913 100644
--- a/arch/x86/tools/insn_decoder_test.c
+++ b/arch/x86/tools/insn_decoder_test.c
@@ -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>