1 files changed, 8 insertions, 25 deletions

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 813e94e7cf29..a6799538069c 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1184,39 +1184,22 @@ static bool symbol__match_regex(struct symbol *sym, regex_t *regex)
         return 0;
 }
 
-static const u8 cpumodes[] = {
-        PERF_RECORD_MISC_USER,
-        PERF_RECORD_MISC_KERNEL,
-        PERF_RECORD_MISC_GUEST_USER,
-        PERF_RECORD_MISC_GUEST_KERNEL
-};
-#define NCPUMODES (sizeof(cpumodes)/sizeof(u8))
-
 static void ip__resolve_ams(struct machine *machine, struct thread *thread,
                             struct addr_map_symbol *ams,
                             u64 ip)
 {
         struct addr_location al;
-        size_t i;
-        u8 m;
 
         memset(&al, 0, sizeof(al));
+        /*
+         * We cannot use the header.misc hint to determine whether a
+         * branch stack address is user, kernel, guest, hypervisor.
+         * Branches may straddle the kernel/user/hypervisor boundaries.
+         * Thus, we have to try consecutively until we find a match
+         * or else, the symbol is unknown
+         */
+        thread__find_cpumode_addr_location(thread, machine, MAP__FUNCTION, ip, &al);
 
-        for (i = 0; i < NCPUMODES; i++) {
-                m = cpumodes[i];
-                /*
-                 * We cannot use the header.misc hint to determine whether a
-                 * branch stack address is user, kernel, guest, hypervisor.
-                 * Branches may straddle the kernel/user/hypervisor boundaries.
-                 * Thus, we have to try consecutively until we find a match
-                 * or else, the symbol is unknown
-                 */
-                thread__find_addr_location(thread, machine, m, MAP__FUNCTION,
-                                ip, &al);
-                if (al.map)
-                        goto found;
-        }
-found:
         ams->addr = ip;
         ams->al_addr = al.addr;
         ams->sym = al.sym;