diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-02-11 08:45:54 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-02-11 08:45:54 -0500 |
commit | 7c940c18c57e45910f7dd9a4011c4658cacba4b6 (patch) | |
tree | d161ba063e2c959984f7a7126c3ed3be2a595d70 /tools/perf/builtin-top.c | |
parent | d5e3d747007fdb541e57ed72e020ff0b94db3470 (diff) | |
parent | 401b8e1317d288f28d6e1afd13271dcb08fd9869 (diff) |
Merge remote branch 'acme/perf/urgent' into perf/core
Fixups due to rename of event_t routines from event__ to perf_event__
done in perf/core.
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/event.c
tools/perf/util/event.h
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-top.c')
-rw-r--r-- | tools/perf/builtin-top.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 210c736e6db4..c9fd66d4a082 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
@@ -876,8 +876,8 @@ static int __cmd_top(void) | |||
876 | return -ENOMEM; | 876 | return -ENOMEM; |
877 | 877 | ||
878 | if (top.target_tid != -1) | 878 | if (top.target_tid != -1) |
879 | perf_event__synthesize_thread(top.target_tid, perf_event__process, | 879 | perf_event__synthesize_thread_map(top.evlist->threads, |
880 | session); | 880 | perf_event__process, session); |
881 | else | 881 | else |
882 | perf_event__synthesize_threads(perf_event__process, session); | 882 | perf_event__synthesize_threads(perf_event__process, session); |
883 | 883 | ||