diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-12-22 11:54:50 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-12-22 11:54:50 +0100 |
commit | 8c1df4002aa425973d7d25ffa56c042acd953bed (patch) | |
tree | 441e39bf3a43bb3e4c4965ed2081b9bb90edd1ea /tools/perf/builtin-annotate.c | |
parent | 6c529a266bdc590a870ee2d2092ff6527eff427b (diff) | |
parent | 21dd9ae5a4e9f717f3957ec934dd3158129436b8 (diff) |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r-- | tools/perf/builtin-annotate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 569a2761b90..c056cdc0691 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -375,6 +375,8 @@ static struct perf_event_ops event_ops = { .mmap = event__process_mmap, .comm = event__process_comm, .fork = event__process_task, + .ordered_samples = true, + .ordering_requires_timestamps = true, }; static int __cmd_annotate(void) @@ -382,7 +384,7 @@ static int __cmd_annotate(void) int ret; struct perf_session *session; - session = perf_session__new(input_name, O_RDONLY, force, false); + session = perf_session__new(input_name, O_RDONLY, force, false, &event_ops); if (session == NULL) return -ENOMEM; |