On Thu, Jun 15, 2017 at 12:55:21PM -0500, Kim Phillips wrote: > cs_etm_evsel is guaranteed to be set at this point in the function. > > Signed-off-by: Kim Phillips <[email protected]> > --- > tools/perf/arch/arm/util/cs-etm.c | 25 ++++++++++++------------- > 1 file changed, 12 insertions(+), 13 deletions(-) > > diff --git a/tools/perf/arch/arm/util/cs-etm.c > b/tools/perf/arch/arm/util/cs-etm.c > index 29361d9b635a..8e1e9469caf2 100644 > --- a/tools/perf/arch/arm/util/cs-etm.c > +++ b/tools/perf/arch/arm/util/cs-etm.c > @@ -202,19 +202,18 @@ static int cs_etm_recording_options(struct > auxtrace_record *itr, > pr_debug2("%s snapshot size: %zu\n", CORESIGHT_ETM_PMU_NAME, > opts->auxtrace_snapshot_size); > > - if (cs_etm_evsel) { > - /* > - * To obtain the auxtrace buffer file descriptor, the auxtrace > - * event must come first. > - */ > - perf_evlist__to_front(evlist, cs_etm_evsel); > - /* > - * In the case of per-cpu mmaps, we need the CPU on the > - * AUX event. > - */ > - if (!cpu_map__empty(cpus)) > - perf_evsel__set_sample_bit(cs_etm_evsel, CPU); > - } > + /* > + * To obtain the auxtrace buffer file descriptor, the auxtrace > + * event must come first. > + */ > + perf_evlist__to_front(evlist, cs_etm_evsel); > + > + /* > + * In the case of per-cpu mmaps, we need the CPU on the > + * AUX event. > + */ > + if (!cpu_map__empty(cpus)) > + perf_evsel__set_sample_bit(cs_etm_evsel, CPU);
Acked-by: Mathieu Poirier <[email protected]> > > /* Add dummy event to keep tracking */ > if (opts->full_auxtrace) { > -- > 2.11.0 >
