diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-12-21 12:15:21 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-12-21 12:15:21 -0800 |
| commit | c183e6c3ec342624c43269c099050d01eeb67e63 (patch) | |
| tree | bbfd027f74581221debe1d31e3b472cc0d03cf3b /include/linux/ring_buffer.h | |
| parent | 9054b41c4e1b5725e573c13166cee56bf7034bbd (diff) | |
| parent | 609d3bc6230514a8ca79b377775b17e8c3d9ac93 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 3c7d295746f6..782e14f62201 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -113,8 +113,7 @@ void ring_buffer_change_overwrite(struct trace_buffer *buffer, int val); struct ring_buffer_event *ring_buffer_lock_reserve(struct trace_buffer *buffer, unsigned long length); -int ring_buffer_unlock_commit(struct trace_buffer *buffer, - struct ring_buffer_event *event); +int ring_buffer_unlock_commit(struct trace_buffer *buffer); int ring_buffer_write(struct trace_buffer *buffer, unsigned long length, void *data); |