Merge tag 'for-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[linux-2.6-microblaze.git] / tools / perf / util / symbol.c

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 053468f..5151a8c 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -663,6 +663,7 @@ static bool symbol__is_idle(const char *name)
                "exit_idle",
                "mwait_idle",
                "mwait_idle_with_hints",
+               "mwait_idle_with_hints.constprop.0",
                "poll_idle",
                "ppc64_runlatch_off",
                "pseries_dedicated_idle_sleep",
@@ -808,7 +809,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,
 
                        if (strcmp(curr_map->dso->short_name, module)) {
                                if (curr_map != initial_map &&
-                                   dso->kernel == DSO_TYPE_GUEST_KERNEL &&
+                                   dso->kernel == DSO_SPACE__KERNEL_GUEST &&
                                    machine__is_default_guest(machine)) {
                                        /*
                                         * We assume all symbols of a module are
@@ -865,7 +866,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,
                                goto add_symbol;
                        }
 
-                       if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
+                       if (dso->kernel == DSO_SPACE__KERNEL_GUEST)
                                snprintf(dso_name, sizeof(dso_name),
                                        "[guest.kernel].%d",
                                        kernel_range++);
@@ -909,7 +910,7 @@ discard_symbol:
        }
 
        if (curr_map != initial_map &&
-           dso->kernel == DSO_TYPE_GUEST_KERNEL &&
+           dso->kernel == DSO_SPACE__KERNEL_GUEST &&
            machine__is_default_guest(kmaps->machine)) {
                dso__set_loaded(curr_map->dso);
        }
@@ -1387,7 +1388,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map,
         * Set the data type and long name so that kcore can be read via
         * dso__data_read_addr().
         */
-       if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
+       if (dso->kernel == DSO_SPACE__KERNEL_GUEST)
                dso->binary_type = DSO_BINARY_TYPE__GUEST_KCORE;
        else
                dso->binary_type = DSO_BINARY_TYPE__KCORE;
@@ -1451,7 +1452,7 @@ int __dso__load_kallsyms(struct dso *dso, const char *filename,
        symbols__fixup_end(&dso->symbols);
        symbols__fixup_duplicate(&dso->symbols);
 
-       if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
+       if (dso->kernel == DSO_SPACE__KERNEL_GUEST)
                dso->symtab_type = DSO_BINARY_TYPE__GUEST_KALLSYMS;
        else
                dso->symtab_type = DSO_BINARY_TYPE__KALLSYMS;
@@ -1537,17 +1538,17 @@ static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod,
        case DSO_BINARY_TYPE__MIXEDUP_UBUNTU_DEBUGINFO:
        case DSO_BINARY_TYPE__BUILDID_DEBUGINFO:
        case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO:
-               return !kmod && dso->kernel == DSO_TYPE_USER;
+               return !kmod && dso->kernel == DSO_SPACE__USER;
 
        case DSO_BINARY_TYPE__KALLSYMS:
        case DSO_BINARY_TYPE__VMLINUX:
        case DSO_BINARY_TYPE__KCORE:
-               return dso->kernel == DSO_TYPE_KERNEL;
+               return dso->kernel == DSO_SPACE__KERNEL;
 
        case DSO_BINARY_TYPE__GUEST_KALLSYMS:
        case DSO_BINARY_TYPE__GUEST_VMLINUX:
        case DSO_BINARY_TYPE__GUEST_KCORE:
-               return dso->kernel == DSO_TYPE_GUEST_KERNEL;
+               return dso->kernel == DSO_SPACE__KERNEL_GUEST;
 
        case DSO_BINARY_TYPE__GUEST_KMODULE:
        case DSO_BINARY_TYPE__GUEST_KMODULE_COMP:
@@ -1650,9 +1651,9 @@ int dso__load(struct dso *dso, struct map *map)
                dso->symtab_type == DSO_BINARY_TYPE__GUEST_KMODULE_COMP;
 
        if (dso->kernel && !kmod) {
-               if (dso->kernel == DSO_TYPE_KERNEL)
+               if (dso->kernel == DSO_SPACE__KERNEL)
                        ret = dso__load_kernel_sym(dso, map);
-               else if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
+               else if (dso->kernel == DSO_SPACE__KERNEL_GUEST)
                        ret = dso__load_guest_kernel_sym(dso, map);
 
                machine = map__kmaps(map)->machine;
@@ -1882,7 +1883,7 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
        else
                symbol__join_symfs(symfs_vmlinux, vmlinux);
 
-       if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
+       if (dso->kernel == DSO_SPACE__KERNEL_GUEST)
                symtab_type = DSO_BINARY_TYPE__GUEST_VMLINUX;
        else
                symtab_type = DSO_BINARY_TYPE__VMLINUX;
@@ -1894,7 +1895,7 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
        symsrc__destroy(&ss);
 
        if (err > 0) {
-               if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
+               if (dso->kernel == DSO_SPACE__KERNEL_GUEST)
                        dso->binary_type = DSO_BINARY_TYPE__GUEST_VMLINUX;
                else
                        dso->binary_type = DSO_BINARY_TYPE__VMLINUX;