Merge branch 'timers/urgent' into timers/core

Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 11e3c8458362..2f9a337b182f 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -549,7 +549,7 @@ static int test__basic_mmap(void)
                         ++foo;
                 }
 
-        while ((event = perf_evlist__read_on_cpu(evlist, 0)) != NULL) {
+        while ((event = perf_evlist__mmap_read(evlist, 0)) != NULL) {
                 struct perf_sample sample;
 
                 if (event->header.type != PERF_RECORD_SAMPLE) {