Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

1 files changed, 7 insertions, 2 deletions

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 281b60e5fc7b..6710ab538342 100644
--- 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;
 };