Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / tools / perf / util / env.h

diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
index ca249bf..6824a74 100644 (file)
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -37,6 +37,18 @@ struct memory_node {
        unsigned long   *set;
 };
 
+struct hybrid_node {
+       char    *pmu_name;
+       char    *cpus;
+};
+
+struct hybrid_cpc_node {
+       int             nr_cpu_pmu_caps;
+       unsigned int    max_branches;
+       char            *cpu_pmu_caps;
+       char            *pmu_name;
+};
+
 struct perf_env {
        char                    *hostname;
        char                    *os_release;
@@ -59,6 +71,8 @@ struct perf_env {
        int                     nr_pmu_mappings;
        int                     nr_groups;
        int                     nr_cpu_pmu_caps;
+       int                     nr_hybrid_nodes;
+       int                     nr_hybrid_cpc_nodes;
        char                    *cmdline;
        const char              **cmdline_argv;
        char                    *sibling_cores;
@@ -77,6 +91,8 @@ struct perf_env {
        struct numa_node        *numa_nodes;
        struct memory_node      *memory_nodes;
        unsigned long long       memory_bsize;
+       struct hybrid_node      *hybrid_nodes;
+       struct hybrid_cpc_node  *hybrid_cpc_nodes;
 #ifdef HAVE_LIBBPF_SUPPORT
        /*
         * bpf_info_lock protects bpf rbtrees. This is needed because the