1 files changed, 4 insertions, 3 deletions

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 5f26620f13f5..176f2f084060 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1946,6 +1946,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
         struct alternative *alt;
         struct instruction *insn, *next_insn;
         struct section *sec;
+        u8 visited;
         int ret;
 
         insn = first;
@@ -1972,12 +1973,12 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
                         return 1;
                 }
 
+                visited = 1 << state.uaccess;
                 if (insn->visited) {
                         if (!insn->hint && !insn_state_match(insn, &state))
                                 return 1;
 
-                        /* If we were here with AC=0, but now have AC=1, go again */
-                        if (insn->state.uaccess || !state.uaccess)
+                        if (insn->visited & visited)
                                 return 0;
                 }
 
@@ -2024,7 +2025,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
                 } else
                         insn->state = state;
 
-                insn->visited = true;
+                insn->visited |= visited;
 
                 if (!insn->ignore_alts) {
                         bool skip_orig = false;