diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-10-09 15:31:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-10-09 15:31:17 +0200 |
| commit | 6fcdb1ed2ef3548d5a9428d6ae60158ddd46a608 (patch) | |
| tree | 2a8bb14cee4c4bc0ec526b5796f318dff9e8c4e9 /tools/perf/builtin-annotate.c | |
| parent | 1d787d37c8ff6612b8151c6dff15bfa7347bcbdf (diff) | |
| parent | 7747e2f4fb5fb840994613dd1474c17cddb7836b (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Handle PERF_RECORD_EXIT events in sched and annotate.
* struct machine refactorings to help in top and trace.
* Add on_exit implementation for systems without one, e.g. Android, from
Bernhard Rosenkraenzer.
* Only process events for vcpus of interest, helps handling large number
of events, from David Ahern.
* Cross compilation fixes for Android, from Irina Tirdea.
* Add documentation on compiling for Android, from Irina Tirdea.
* perf diff improvements from Jiri Olsa.
* Target (task/user/cpu/syswide) handling improvements, from Namhyung Kim.
* Add support in 'trace' for tracing workload given by command line, from
Namhyung Kim.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 9ea38540b873..690fa9a54657 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -246,7 +246,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) .sample = process_sample_event, .mmap = perf_event__process_mmap, .comm = perf_event__process_comm, - .fork = perf_event__process_task, + .exit = perf_event__process_exit, + .fork = perf_event__process_fork, .ordered_samples = true, .ordering_requires_timestamps = true, }, |