Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50ecf2c3 authored by Yoshihiro YUNOMAE's avatar Yoshihiro YUNOMAE Committed by Steven Rostedt
Browse files

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/1349998076-15495-5-git-send-email-dhsharp@google.com



Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: default avatarYoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Signed-off-by: default avatarDavid Sharp <dhsharp@google.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 60303ed3

include/linux/ring_buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ int ring_buffer_record_is_on(struct ring_buffer *buffer); 
void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu);

void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu);



unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);

u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_entries(struct ring_buffer *buffer);

unsigned long ring_buffer_overruns(struct ring_buffer *buffer);

kernel/trace/ring_buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -2932,12 +2932,12 @@ rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer) 
 * @buffer: The ring buffer

 * @cpu: The per CPU buffer to read from.

 */

unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)

u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)

{

	unsigned long flags;

	struct ring_buffer_per_cpu *cpu_buffer;

	struct buffer_page *bpage;

	unsigned long ret;

	u64 ret;



	if (!cpumask_test_cpu(cpu, buffer->cpumask))

		return 0;