diff options
| author | Greg Kroah-Hartman <[email protected]> | 2017-06-03 09:47:16 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2017-06-03 09:47:16 +0900 |
| commit | b132e4a25dccf5d5857e6ce2d96541be51aa9c5e (patch) | |
| tree | 64a6474bc7c218ff228469fda4600556217939b8 /kernel/bpf/arraymap.c | |
| parent | b3addcf0d1f04f53fcc302577d5a5e964c18531a (diff) | |
| parent | afbbc7913a288c29616bd31ae612548f6475151a (diff) | |
Merge tag 'fixes-for-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.12-rc4
A fix to a really old synchronization bug on mass storage gadget.
Support for Meson8 SoCs on dwc2
Synchronization fixes on renesas USB driver.
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) |