Merge tag 'v5.9-rc2' into regulator-5.9

[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 7632075..a129726 100644 (file)
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -48,6 +48,7 @@ struct perf_env {
        char                    *cpuid;
        unsigned long long      total_mem;
        unsigned int            msr_pmu_type;
+       unsigned int            max_branches;
 
        int                     nr_cmdline;
        int                     nr_sibling_cores;
@@ -57,12 +58,14 @@ struct perf_env {
        int                     nr_memory_nodes;
        int                     nr_pmu_mappings;
        int                     nr_groups;
+       int                     nr_cpu_pmu_caps;
        char                    *cmdline;
        const char              **cmdline_argv;
        char                    *sibling_cores;
        char                    *sibling_dies;
        char                    *sibling_threads;
        char                    *pmu_mappings;
+       char                    *cpu_pmu_caps;
        struct cpu_topology_map *cpu;
        struct cpu_cache_level  *caches;
        int                      caches_cnt;
@@ -74,7 +77,6 @@ struct perf_env {
        struct numa_node        *numa_nodes;
        struct memory_node      *memory_nodes;
        unsigned long long       memory_bsize;
-       u64                     clockid_res_ns;
 
        /*
         * bpf_info_lock protects bpf rbtrees. This is needed because the
@@ -97,6 +99,19 @@ struct perf_env {
        /* For fast cpu to numa node lookup via perf_env__numa_node */
        int                     *numa_map;
        int                      nr_numa_map;
+
+       /* For real clock time reference. */
+       struct {
+               u64     tod_ns;
+               u64     clockid_ns;
+               u64     clockid_res_ns;
+               int     clockid;
+               /*
+                * enabled is valid for report mode, and is true if above
+                * values are set, it's set in process_clock_data
+                */
+               bool    enabled;
+       } clock;
 };
 
 enum perf_compress_type {