Skip to content

Commit 74131a0

Browse files
committed
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
2 parents 9db0d7c + c44b4b9 commit 74131a0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

tools/objtool/check.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3516,8 +3516,11 @@ static bool skip_alt_group(struct instruction *insn)
35163516
{
35173517
struct instruction *alt_insn = insn->alts ? insn->alts->insn : NULL;
35183518

3519+
if (!insn->alt_group)
3520+
return false;
3521+
35193522
/* ANNOTATE_IGNORE_ALTERNATIVE */
3520-
if (insn->alt_group && insn->alt_group->ignore)
3523+
if (insn->alt_group->ignore)
35213524
return true;
35223525

35233526
/*

0 commit comments

Comments
 (0)