Merge up to bpf_probe_read_kernel_str() fix into bpf-next

2020-06-23 15:32:42 -07:00
parent 9d9d8cc21e 02553b91da
commit 4e608675e7
7 changed files with 11 additions and 24 deletions
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -49,6 +49,7 @@ const char * const map_type_name[] = {
 	[BPF_MAP_TYPE_STACK]			= "stack",
 	[BPF_MAP_TYPE_SK_STORAGE]		= "sk_storage",
 	[BPF_MAP_TYPE_STRUCT_OPS]		= "struct_ops",
+	[BPF_MAP_TYPE_RINGBUF]			= "ringbuf",
 };

 const size_t map_type_name_size = ARRAY_SIZE(map_type_name);