diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-31 09:51:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-31 09:51:45 +1100 |
| commit | 4edc32824777704dc5ed25b70aef004763b4d2a3 (patch) | |
| tree | 142a9d4dfa862514fd65a0bab3d1808a0e4d696a /kernel | |
| parent | 9da75699bcb895ac55f079c4cf854ab480c15e14 (diff) | |
| parent | cb41c997d4446b39dd03b8a74196125739d7c3ac (diff) | |
| download | linux-next-4edc32824777704dc5ed25b70aef004763b4d2a3.tar.gz | |
Merge remote-tracking branch 'net/master'
Diffstat (limited to 'kernel')
| -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 |