Merge tag 'selinux-pr-20200416' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / tools / perf / util / unwind-libunwind-local.c

diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c
index 6d53347..b4649f5 100644 (file)
--- a/tools/perf/util/unwind-libunwind-local.c
+++ b/tools/perf/util/unwind-libunwind-local.c
@@ -578,7 +578,7 @@ static int entry(u64 ip, struct thread *thread,
        e.ms.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);
        e.ip     = ip;
        e.ms.map = al.map;
-       e.ms.mg  = al.mg;
+       e.ms.maps = al.maps;
 
        pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",
                 al.sym ? al.sym->name : "''",
@@ -616,26 +616,26 @@ static unw_accessors_t accessors = {
        .get_proc_name          = get_proc_name,
 };
 
-static int _unwind__prepare_access(struct map_groups *mg)
+static int _unwind__prepare_access(struct maps *maps)
 {
-       mg->addr_space = unw_create_addr_space(&accessors, 0);
-       if (!mg->addr_space) {
+       maps->addr_space = unw_create_addr_space(&accessors, 0);
+       if (!maps->addr_space) {
                pr_err("unwind: Can't create unwind address space.\n");
                return -ENOMEM;
        }
 
-       unw_set_caching_policy(mg->addr_space, UNW_CACHE_GLOBAL);
+       unw_set_caching_policy(maps->addr_space, UNW_CACHE_GLOBAL);
        return 0;
 }
 
-static void _unwind__flush_access(struct map_groups *mg)
+static void _unwind__flush_access(struct maps *maps)
 {
-       unw_flush_cache(mg->addr_space, 0, 0);
+       unw_flush_cache(maps->addr_space, 0, 0);
 }
 
-static void _unwind__finish_access(struct map_groups *mg)
+static void _unwind__finish_access(struct maps *maps)
 {
-       unw_destroy_addr_space(mg->addr_space);
+       unw_destroy_addr_space(maps->addr_space);
 }
 
 static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
@@ -660,7 +660,7 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
         */
        if (max_stack - 1 > 0) {
                WARN_ONCE(!ui->thread, "WARNING: ui->thread is NULL");
-               addr_space = ui->thread->mg->addr_space;
+               addr_space = ui->thread->maps->addr_space;
 
                if (addr_space == NULL)
                        return -1;
@@ -709,7 +709,7 @@ static int _unwind__get_entries(unwind_entry_cb_t cb, void *arg,
        struct unwind_info ui = {
                .sample       = data,
                .thread       = thread,
-               .machine      = thread->mg->machine,
+               .machine      = thread->maps->machine,
        };
 
        if (!data->user_regs.regs)