diff options
| author |   Tony Lindgren <tony@atomide.com> | 2021-05-18 09:45:08 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-05-18 09:45:08 +0300 |
| commit | 85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34 (patch) | |
| tree | dc6b176404218efac28a4a1a0c240cb36f1e9173 /include/linux/ring_buffer.h | |
| parent | Merge branch 'omap-for-v5.13/ti-sysc' into fixes (diff) | |
| parent | ARM: OMAP2+: Fix build warning when mmc_omap is not built (diff) | |
| download | linux-dev-85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34.tar.xz linux-dev-85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34.zip | |
Merge branch 'fixes-rc1' into fixes
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 136ea0997e6d..dac53fd3afea 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -61,7 +61,8 @@ enum ring_buffer_type { unsigned ring_buffer_event_length(struct ring_buffer_event *event); void *ring_buffer_event_data(struct ring_buffer_event *event); -u64 ring_buffer_event_time_stamp(struct ring_buffer_event *event); +u64 ring_buffer_event_time_stamp(struct trace_buffer *buffer, + struct ring_buffer_event *event); /* * ring_buffer_discard_commit will remove an event that has not @@ -180,7 +181,7 @@ unsigned long ring_buffer_commit_overrun_cpu(struct trace_buffer *buffer, int cp unsigned long ring_buffer_dropped_events_cpu(struct trace_buffer *buffer, int cpu); unsigned long ring_buffer_read_events_cpu(struct trace_buffer *buffer, int cpu); -u64 ring_buffer_time_stamp(struct trace_buffer *buffer, int cpu); +u64 ring_buffer_time_stamp(struct trace_buffer *buffer); void ring_buffer_normalize_time_stamp(struct trace_buffer *buffer, int cpu, u64 *ts); void ring_buffer_set_clock(struct trace_buffer *buffer, |