regmap: Fix i2c word access when using SMBus access functions

[karo-tx-linux.git] / tools / perf / util / unwind-libunwind.c

diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index 4d45c0dfe34347ef57527dd90f132e9067eb57e9..371219a6daf1cd8209687115bca9a67f7ffc3209 100644 (file)
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -284,7 +284,7 @@ static struct map *find_map(unw_word_t ip, struct unwind_info *ui)
 {
        struct addr_location al;
 
-       thread__find_addr_map(ui->thread, ui->machine, PERF_RECORD_MISC_USER,
+       thread__find_addr_map(ui->thread, PERF_RECORD_MISC_USER,
                              MAP__FUNCTION, ip, &al);
        return al.map;
 }
@@ -374,7 +374,7 @@ static int access_dso_mem(struct unwind_info *ui, unw_word_t addr,
        struct addr_location al;
        ssize_t size;
 
-       thread__find_addr_map(ui->thread, ui->machine, PERF_RECORD_MISC_USER,
+       thread__find_addr_map(ui->thread, PERF_RECORD_MISC_USER,
                              MAP__FUNCTION, addr, &al);
        if (!al.map) {
                pr_debug("unwind: no map for %lx\n", (unsigned long)addr);
@@ -476,14 +476,13 @@ static void put_unwind_info(unw_addr_space_t __maybe_unused as,
        pr_debug("unwind: put_unwind_info called\n");
 }
 
-static int entry(u64 ip, struct thread *thread, struct machine *machine,
+static int entry(u64 ip, struct thread *thread,
                 unwind_entry_cb_t cb, void *arg)
 {
        struct unwind_entry e;
        struct addr_location al;
 
-       thread__find_addr_location(thread, machine,
-                                  PERF_RECORD_MISC_USER,
+       thread__find_addr_location(thread, PERF_RECORD_MISC_USER,
                                   MAP__FUNCTION, ip, &al);
 
        e.ip = ip;
@@ -586,21 +585,21 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
                unw_word_t ip;
 
                unw_get_reg(&c, UNW_REG_IP, &ip);
-               ret = ip ? entry(ip, ui->thread, ui->machine, cb, arg) : 0;
+               ret = ip ? entry(ip, ui->thread, cb, arg) : 0;
        }
 
        return ret;
 }
 
 int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
-                       struct machine *machine, struct thread *thread,
+                       struct thread *thread,
                        struct perf_sample *data, int max_stack)
 {
        u64 ip;
        struct unwind_info ui = {
                .sample       = data,
                .thread       = thread,
-               .machine      = machine,
+               .machine      = thread->mg->machine,
        };
        int ret;
 
@@ -611,7 +610,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
        if (ret)
                return ret;
 
-       ret = entry(ip, thread, machine, cb, arg);
+       ret = entry(ip, thread, cb, arg);
        if (ret)
                return -ENOMEM;