diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-12-17 01:45:03 +0300 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-12-17 01:45:03 +0300 |
| commit | 563a5423b7b75e1bee8b91caddf3181cca2a74bd (patch) | |
| tree | 44fa2159392be20e96434588a866813dc08b11d7 /include/linux/ring_buffer.h | |
| parent | f9eeef5918bbe1f2545d36280330dced25d6cf97 (diff) | |
| parent | 77856d911a8c8724ee8e2b09d55979fc1de8f1c0 (diff) | |
| download | linux-563a5423b7b75e1bee8b91caddf3181cca2a74bd.tar.xz | |
Merge branch 'master' into mm-nonmm-stable
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); |