diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2020-06-23 15:32:42 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-06-23 15:33:41 -0700 |
| commit | 4e608675e790b3f61b98bc38b3e8a38613b480ab (patch) | |
| tree | 75252ccde9e3922143fe16ec7e346cbe5a4b680d /include/uapi | |
| parent | tools, bpftool: Correctly evaluate $(BUILD_BPF_SKELS) in Makefile (diff) | |
| parent | bpf: bpf_probe_read_kernel_str() has to return amount of data read on success (diff) | |
| download | linux-dev-4e608675e790b3f61b98bc38b3e8a38613b480ab.tar.xz linux-dev-4e608675e790b3f61b98bc38b3e8a38613b480ab.zip | |
Merge up to bpf_probe_read_kernel_str() fix into bpf-next
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/bpf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index be0efee49093..9d3923e6b860 100644 --- a/include/uapi/linux/bpf.h +++ b/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 |