Merge branch 'linus' into perf/urgent, to pick up dependent commits

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index e2636737b69b..c4b9ab01bba5 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -492,7 +492,7 @@ static void *perf_event_fd_array_get_ptr(struct bpf_map *map,
 
         ee = ERR_PTR(-EOPNOTSUPP);
         event = perf_file->private_data;
-        if (perf_event_read_local(event, &value) == -EOPNOTSUPP)
+        if (perf_event_read_local(event, &value, NULL, NULL) == -EOPNOTSUPP)
                 goto err_out;
 
         ee = bpf_event_entry_gen(perf_file, map_file);