diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-03-21 10:02:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-03-21 10:02:36 +0300 |
| commit | f6472b17933f9adb825e7c7da31f7b7b2edb1950 (patch) | |
| tree | 84cca5e27843ed65fd49e62352d0a1de582470be /include/linux/ring_buffer.h | |
| parent | 763aacf86f1baefb134c70813aa8c72d1675d738 (diff) | |
| parent | f338e77383789c0cae23ca3d48adcc5e9e137e3c (diff) | |
| download | linux-f6472b17933f9adb825e7c7da31f7b7b2edb1950.tar.xz | |
Merge tag 'v7.0-rc4' into timers/core, to resolve conflict
Resolve conflict between this change in the upstream kernel:
4c652a47722f ("rseq: Mark rseq_arm_slice_extension_timer() __always_inline")
... and this pending change in timers/core:
0e98eb14814e ("entry: Prepare for deferred hrtimer rearming")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 876358cfe1b1..d862fa610270 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -248,6 +248,7 @@ int trace_rb_cpu_prepare(unsigned int cpu, struct hlist_node *node); int ring_buffer_map(struct trace_buffer *buffer, int cpu, struct vm_area_struct *vma); +void ring_buffer_map_dup(struct trace_buffer *buffer, int cpu); int ring_buffer_unmap(struct trace_buffer *buffer, int cpu); int ring_buffer_map_get_reader(struct trace_buffer *buffer, int cpu); #endif /* _LINUX_RING_BUFFER_H */ |