Merge branch 'linus' into x86/urgent

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / tools / perf / util / evsel.h

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 281b60e5fc7b4bb68240d48f7b99e494c091fa38..6710ab538342fe1d5970c812423908ddec3ee5a7 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -49,12 +49,17 @@ struct perf_evsel {
        struct perf_event_attr  attr;
        char                    *filter;
        struct xyarray          *fd;
-       struct xyarray          *id;
+       struct xyarray          *sample_id;
+       u64                     *id;
        struct perf_counts      *counts;
        int                     idx;
+       int                     ids;
        struct hists            hists;
        char                    *name;
-       void                    *priv;
+       union {
+               void            *priv;
+               off_t           id_offset;
+       };
        struct cgroup_sel       *cgrp;
 };