diff options
author | 2014-04-29 10:01:28 -0700 | |
---|---|---|
committer | 2014-04-29 10:01:28 -0700 | |
commit | 3e93457b45a1a8c69227ce596ee2005fa06f20dd (patch) | |
tree | 248c27e432533b1af80a9b2240eaa8e48e3b87cc /tools/perf/tests/code-reading.c | |
parent | regulator: tps65090: Allow setting the overcurrent wait time (diff) | |
parent | mfd: tps65090: Stop caching most registers (diff) | |
download | linux-dev-3e93457b45a1a8c69227ce596ee2005fa06f20dd.tar.xz linux-dev-3e93457b45a1a8c69227ce596ee2005fa06f20dd.zip |
Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090
Immutable branch between MFD and Regulator due for v3.16 merge-window.
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 653a8fe2db95..bfb186900ac0 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; |