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>

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 07f8d6d852c2..12e0e41696d9 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -680,9 +680,9 @@ static int __cmd_record(int argc, const char **argv)
                                                perf_event__synthesize_guest_os);
 
         if (!system_wide)
-                perf_event__synthesize_thread(target_tid,
-                                              process_synthesized_event,
-                                              session);
+                perf_event__synthesize_thread_map(evsel_list->threads,
+                                                  process_synthesized_event,
+                                                  session);
         else
                 perf_event__synthesize_threads(process_synthesized_event,
                                                session);