diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-08 10:12:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-08 10:12:12 +0200 |
| commit | a5506c46a4d249a422b0eca537026fc7a1ac78b5 (patch) | |
| tree | 6a463b0e6ac0ca16eb195a4f49a22afb1403337f /kernel/bpf/arraymap.c | |
| parent | 36cc2b9222b5106de34085c4dd8635ac67ef5cba (diff) | |
| parent | cc1582c231ea041fbc68861dfaf957eaf902b829 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 5e00b2333c26..172dc8ee0e3b 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -86,6 +86,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr) array->map.key_size = attr->key_size; array->map.value_size = attr->value_size; array->map.max_entries = attr->max_entries; + array->map.map_flags = attr->map_flags; array->elem_size = elem_size; if (!percpu) |