Merge branch 'linus' into perf/core, to refresh the branch

[linux-2.6-block.git] / kernel / bpf / stackmap.c

diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c
index 080a2dfb58004c06de7320c05e3404baab46562e..bf4495fcd25d6775f9144564fe16a7fda95a1c67 100644 (file)
--- a/kernel/bpf/stackmap.c
+++ b/kernel/bpf/stackmap.c
@@ -99,7 +99,7 @@ static struct bpf_map *stack_map_alloc(union bpf_attr *attr)
        if (err)
                goto free_smap;
 
-       err = get_callchain_buffers();
+       err = get_callchain_buffers(sysctl_perf_event_max_stack);
        if (err)
                goto free_smap;