diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-06-24 01:32:42 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-06-24 01:33:41 +0300 |
| commit | 4e608675e790b3f61b98bc38b3e8a38613b480ab (patch) | |
| tree | 75252ccde9e3922143fe16ec7e346cbe5a4b680d /tools | |
| parent | 9d9d8cc21e3827b89e414f990016836290de3038 (diff) | |
| parent | 02553b91da5deb63c8562b47529b09b734659af0 (diff) | |
| download | linux-4e608675e790b3f61b98bc38b3e8a38613b480ab.tar.xz | |
Merge up to bpf_probe_read_kernel_str() fix into bpf-next
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bpf/bpftool/map.c | 1 | ||||
| -rw-r--r-- | tools/include/uapi/linux/bpf.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index 0a6a5d82d380..bbb74d387fb0 100644 --- 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); diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index be0efee49093..9d3923e6b860 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -3168,7 +3168,7 @@ union bpf_attr { * Return * The id is returned or 0 in case the id could not be retrieved. * - * void *bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags) + * int bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags) * Description * Copy *size* bytes from *data* into a ring buffer *ringbuf*. * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of |