From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Wed, 8 Jul 2020 16:49:15 +0000 (-0300)
Subject: Merge remote-tracking branch 'torvalds/master' into perf/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=facbf0b9820f34f14b54f567862b4a96e910f468;p=linux.git

Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes and move perf/core forward, minor conflict as
perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a
'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/
specific, it is not in libperf.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---

facbf0b9820f34f14b54f567862b4a96e910f468
diff --cc tools/perf/builtin-record.c
index 19b1d5effb7a7,a37e7910e9e90..bf1f18366726e
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@@ -852,15 -852,15 +852,15 @@@ static int record__open(struct record *
  	 * event synthesis.
  	 */
  	if (opts->initial_delay || target__has_cpu(&opts->target)) {
- 		if (evlist__add_dummy(evlist))
- 			return -ENOMEM;
- 
- 		/* Disable tracking of mmaps on lead event. */
- 		pos = evlist__first(evlist);
- 		pos->tracking = 0;
- 		/* Set up dummy event. */
- 		pos = evlist__last(evlist);
- 		pos->tracking = 1;
+ 		pos = perf_evlist__get_tracking_event(evlist);
+ 		if (!evsel__is_dummy_event(pos)) {
+ 			/* Set up dummy event. */
 -			if (perf_evlist__add_dummy(evlist))
++			if (evlist__add_dummy(evlist))
+ 				return -ENOMEM;
+ 			pos = evlist__last(evlist);
+ 			perf_evlist__set_tracking_event(evlist, pos);
+ 		}
+ 
  		/*
  		 * Enable the dummy event when the process is forked for
  		 * initial_delay, immediately for system wide.