summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-11-01 10:07:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-11-01 10:07:35 -0700
commit74131a0f1b9efc1364871a04b704e54309861668 (patch)
treea11bf4072bea6de1734d5d2828087219421034f4
parent9db0d7c5a5be25e56c3eacc1f03d296b7b0b960f (diff)
parentc44b4b9eeb71f5b0b617abf6fd66d1ef0aab6200 (diff)
Merge tag 'objtool-urgent-2025-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fix from Ingo Molnar: "Fix objtool warning when faced with raw STAC/CLAC instructions" * tag 'objtool-urgent-2025-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Fix skip_alt_group() for non-alternative STAC/CLAC
-rw-r--r--tools/objtool/check.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 620854fdaaf6..9004fbc06769 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -3516,8 +3516,11 @@ static bool skip_alt_group(struct instruction *insn)
{
struct instruction *alt_insn = insn->alts ? insn->alts->insn : NULL;
+ if (!insn->alt_group)
+ return false;
+
/* ANNOTATE_IGNORE_ALTERNATIVE */
- if (insn->alt_group && insn->alt_group->ignore)
+ if (insn->alt_group->ignore)
return true;
/*