perf/urgent fixes:
Developer stuff: . Instead of redirecting flex output, use -o (Cody P Schafer) . Fix double free in perf test 21 (Adrian Hunter) Signed-off-by: Jiri Olsa <jolsa@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTTSD1AAoJEPZqUSBWB3s90nQQAL2bMOrANdr5dKtvQ38cnAqg gwGnt2L+eFhz3qSUZ3RUKDD3lZALrH/3bvTaNI+QdAjBM6Lup486ksFmXKVQ20uG k4ZrLaYWsexgx0hSV9VdylpSJS1xOKd36fuemJTcvGuh+W5TfxE6kzg8F77iwxTD QpkGmfkA5n/d+tUJgrQXDqsen2eseIGX+0UG8/YvzM6IXVdqK0kEpIJu+Dzy+8hH eV8OD+JbfbBpthSuwzrQiyXuU4nNukPxsVlKtVx91OaBf9ALIveII+HIp9mP3/cO pkVqws8xeEc1iZsSETjoHqvaQczbedoJRlkMRjMpnGvsiSsL2MZykw2xAeV2pYxi x9jzbY1Uosz7lo92gZHydNPgxKw/rjHPDtWaFk6qoU/bFdlCmyjvgoJ3U+8/ELEA Kt+dj/GgIEbBkh9GNtYz7uYYwIN1oio02DsbD3W0lLAjGF9W6yYM6SA1vMwN7xjt QAtV2biVqW2CAF1nOW5GDWKLOs0IS2+l9g+9ZoT4CaifYTb6RfwLAnTCrU8/jMIT QJ0kI6cxKCbC08aX45eZitOeUVsrsoH3ZQw6nBmnwwj9DBjzql3TVKdhqQsnz6Rd BDOOs3/6w8ZG21x0879N41Je4+EhxuOK93Qj9wfJCLcYwPm13uleAvYgSHsqtRTg /b9g38/s0sdUdrNjpRvt =tiL8 -----END PGP SIGNATURE----- Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/urgent Pull perf/urgent fixes from Jiri Olsa: * Instead of redirecting flex output, use -o (Cody P Schafer) * Fix double free in perf test 21 (Adrian Hunter) Signed-off-by: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
commit
ad466db5b0
|
@ -192,13 +192,13 @@ endif
|
|||
export PERL_PATH
|
||||
|
||||
$(OUTPUT)util/parse-events-flex.c: util/parse-events.l $(OUTPUT)util/parse-events-bison.c
|
||||
$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c
|
||||
$(QUIET_FLEX)$(FLEX) -o $@ --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) util/parse-events.l
|
||||
|
||||
$(OUTPUT)util/parse-events-bison.c: util/parse-events.y
|
||||
$(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c -p parse_events_
|
||||
|
||||
$(OUTPUT)util/pmu-flex.c: util/pmu.l $(OUTPUT)util/pmu-bison.c
|
||||
$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c
|
||||
$(QUIET_FLEX)$(FLEX) -o $@ --header-file=$(OUTPUT)util/pmu-flex.h util/pmu.l
|
||||
|
||||
$(OUTPUT)util/pmu-bison.c: util/pmu.y
|
||||
$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_
|
||||
|
|
|
@ -504,6 +504,7 @@ static int do_test_code_reading(bool try_kcore)
|
|||
if (ret < 0) {
|
||||
if (!excl_kernel) {
|
||||
excl_kernel = true;
|
||||
perf_evlist__set_maps(evlist, NULL, NULL);
|
||||
perf_evlist__delete(evlist);
|
||||
evlist = NULL;
|
||||
continue;
|
||||
|
|
Loading…
Reference in a new issue