Skip to content

Commit 50ecf2c

Browse files
Yoshihiro YUNOMAErostedt
authored andcommitted
ring-buffer: Change unsigned long type of ring_buffer_oldest_event_ts() to u64
ring_buffer_oldest_event_ts() should return a value of u64 type, because ring_buffer_per_cpu->buffer_page->buffer_data_page->time_stamp is u64 type. Link: http://lkml.kernel.org/r/[email protected] Cc: Frederic Weisbecker <[email protected]> Cc: Vaibhav Nagarnaik <[email protected]> Signed-off-by: Yoshihiro YUNOMAE <[email protected]> Signed-off-by: David Sharp <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
1 parent 60303ed commit 50ecf2c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/linux/ring_buffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ int ring_buffer_record_is_on(struct ring_buffer *buffer);
159159
void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu);
160160
void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu);
161161

162-
unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);
162+
u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);
163163
unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu);
164164
unsigned long ring_buffer_entries(struct ring_buffer *buffer);
165165
unsigned long ring_buffer_overruns(struct ring_buffer *buffer);

kernel/trace/ring_buffer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2932,12 +2932,12 @@ rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
29322932
* @buffer: The ring buffer
29332933
* @cpu: The per CPU buffer to read from.
29342934
*/
2935-
unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
2935+
u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
29362936
{
29372937
unsigned long flags;
29382938
struct ring_buffer_per_cpu *cpu_buffer;
29392939
struct buffer_page *bpage;
2940-
unsigned long ret;
2940+
u64 ret;
29412941

29422942
if (!cpumask_test_cpu(cpu, buffer->cpumask))
29432943
return 0;

0 commit comments

Comments
 (0)