diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-10-18 09:04:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-10-18 09:04:02 +0200 |
| commit | 3b10ea7f922b538ba5dcb3d979a6b6b4d07daae2 (patch) | |
| tree | e7d8e31708d8b553973154dbe1e8b9b7d9ad81c3 /tools/perf/util/evsel.h | |
| parent | 691286b5561aab2e1b00119bc328598c01250548 (diff) | |
| parent | e8564b710c6df2c3aeb56c507c22f4bcfa4c0b2d (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
* Add period data column and make it default in 'perf script' (Jiri Olsa)
Infrastructure changes:
* Move exit stuff from perf_evsel__delete to perf_evsel__exit, delete
should be just a front end for exit + free (Arnaldo Carvalho de Melo)
* Add missing 'struct option' forward declaration (Arnaldo Carvalho de Melo)
* No need to drag util/cgroup.h into evsel.h (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/evsel.h')
| -rw-r--r-- | tools/perf/util/evsel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 1d5c754aebc..163c5604e5d 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -7,7 +7,6 @@ #include <linux/perf_event.h> #include <linux/types.h> #include "xyarray.h" -#include "cgroup.h" #include "symbol.h" struct perf_counts_values { @@ -42,6 +41,8 @@ struct perf_sample_id { u64 period; }; +struct cgroup_sel; + /** struct perf_evsel - event selector * * @name - Can be set to retain the original event name passed by the user, |