diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-21 10:42:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-21 10:42:09 +0200 |
| commit | 73787190d04a34e6da745da893b3ae8bedde418f (patch) | |
| tree | bc1046eb1864237741898992673f17c577b83929 /tools/perf/builtin-script.c | |
| parent | 6f5e3577d47aeb4ef39683cbf9e201554bc7054d (diff) | |
| parent | 1c698186abf5caaea06fda66590f6a0e0a21628d (diff) | |
Merge branch 'perf/parse-events-4' of git://github.com/fweisbec/tracing into perf/core
Conflicts:
tools/perf/Makefile
This tree from Frederic unifies the perf and trace-cmd trace event format
parsing code into a single library.
Powertop and other tools will also be able to make use of it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index d4ce733b9eb..8e395a538eb 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -261,7 +261,7 @@ static void print_sample_start(struct perf_sample *sample, struct perf_event_attr *attr) { int type; - struct event *event; + struct event_format *event; const char *evname = NULL; unsigned long secs; unsigned long usecs; |