diff options
| author | Tejun Heo <tj@kernel.org> | 2024-09-04 11:41:32 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-09-04 11:41:32 -1000 |
| commit | 649e980dadee36f961738d054627225542d547a2 (patch) | |
| tree | a67f0dc4ea53f03c85f5e0648f83f3ff0e4877f7 /include/linux/ring_buffer.h | |
| parent | a4103eacc2ab408bb65e9902f0857b219fb489de (diff) | |
| parent | 2ad6d23f465a4f851e3bcf6d74c315ce7b2c205b (diff) | |
Merge branch 'bpf/master' into for-6.12
Pull bpf/master to receive baebe9aaba1e ("bpf: allow passing struct
bpf_iter_<type> as kfunc arguments") and related changes in preparation for
the DSQ iterator patchset.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 96d2140b471e..fd35d4ec12e1 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -193,7 +193,6 @@ void ring_buffer_set_clock(struct trace_buffer *buffer, void ring_buffer_set_time_stamp_abs(struct trace_buffer *buffer, bool abs); bool ring_buffer_time_stamp_abs(struct trace_buffer *buffer); -size_t ring_buffer_nr_pages(struct trace_buffer *buffer, int cpu); size_t ring_buffer_nr_dirty_pages(struct trace_buffer *buffer, int cpu); struct buffer_data_read_page; |