diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 15:41:58 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 15:41:58 -0700 |
| commit | 636c8a8d85d0564222071f0caa4a4e6bf527efe5 (patch) | |
| tree | f1958f80f596cfcf496904f12a62662fa79ce990 /kernel/bpf | |
| parent | 39ec5cbed0bb1878d0b65af0c5e653e37e1945a5 (diff) | |
| parent | d48d5691ebf88a15d95ba96486917ffc79256536 (diff) | |
| download | linux-636c8a8d85d0564222071f0caa4a4e6bf527efe5.tar.gz linux-636c8a8d85d0564222071f0caa4a4e6bf527efe5.zip | |
Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.6-rc3
Here are some new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/syscall.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 2a2efe1bc76c..adc5e4bd74f8 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -137,11 +137,13 @@ static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp) "map_type:\t%u\n" "key_size:\t%u\n" "value_size:\t%u\n" - "max_entries:\t%u\n", + "max_entries:\t%u\n" + "map_flags:\t%#x\n", map->map_type, map->key_size, map->value_size, - map->max_entries); + map->max_entries, + map->map_flags); } #endif |