summaryrefslogtreecommitdiffstats
path: root/kernel/bpf/arraymap.c
diff options
context:
space:
mode:
authorDaniel Borkmann2018-05-23 12:03:33 +0200
committerDaniel Borkmann2018-05-23 12:03:34 +0200
commitff4fb475cea8580eb0490d0a5d55ee02d95d26e1 (patch)
tree10cf3d584e25f564d0cbc3653eb428dd21962f1d /kernel/bpf/arraymap.c
parentMerge branch 'bpf-fib-mtu-check' (diff)
parentbpf: btf: Add tests for the btf uapi changes (diff)
downloadkernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.tar.gz
kernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.tar.xz
kernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.zip
Merge branch 'btf-uapi-cleanups'
Martin KaFai Lau says: ==================== This patch set makes some changes to cleanup the unused bits in BTF uapi. It also makes the btf_header extensible. Please see individual patches for details. v2: - Remove NR_SECS from patch 2 - Remove "unsigned" check on array->index_type from patch 3 - Remove BTF_INT_VARARGS and further limit BTF_INT_ENCODING from 8 bits to 4 bits in patch 4 - Adjustments in test_btf.c to reflect changes in v2 ==================== Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'kernel/bpf/arraymap.c')
-rw-r--r--kernel/bpf/arraymap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index 0fd8d8f1a398..544e58f5f642 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -352,7 +352,7 @@ static void array_map_seq_show_elem(struct bpf_map *map, void *key,
}
seq_printf(m, "%u: ", *(u32 *)key);
- btf_type_seq_show(map->btf, map->btf_value_id, value, m);
+ btf_type_seq_show(map->btf, map->btf_value_type_id, value, m);
seq_puts(m, "\n");
rcu_read_unlock();