diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
commit | 1111b680d34bc19190f02a1b4479c3fcc592c22e (patch) | |
tree | 9d45ad88b9354205a2d1fd76a338ab8693a16d86 /tools/perf/tests/code-reading.c | |
parent | 37b6cb475a6d74bc047c53bc323d6eb3113e27a4 (diff) | |
parent | 24223657806a0ebd0ae5c9caaf7b021091889cf2 (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up PMU driver fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/tests/code-reading.c')
-rw-r--r-- | tools/perf/tests/code-reading.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 653a8fe2db9..bfb186900ac 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -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; |