diff options
author | Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com> | 2012-10-11 19:27:54 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-02 10:21:48 -0400 |
commit | 50ecf2c3afead23a05227ab004e4212eca08c207 (patch) | |
tree | 3253309826c5c39208707a5b5e0afca9c9b5efbd /kernel/trace/ring_buffer.c | |
parent | 60303ed3f4b9332b9aa9bc17c68bc174e7343e2d (diff) |
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: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Signed-off-by: David Sharp <dhsharp@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/ring_buffer.c')
-rw-r--r-- | kernel/trace/ring_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 23a384b92512..3c7834c24e54 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -2932,12 +2932,12 @@ rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer) | |||
2932 | * @buffer: The ring buffer | 2932 | * @buffer: The ring buffer |
2933 | * @cpu: The per CPU buffer to read from. | 2933 | * @cpu: The per CPU buffer to read from. |
2934 | */ | 2934 | */ |
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) |
2936 | { | 2936 | { |
2937 | unsigned long flags; | 2937 | unsigned long flags; |
2938 | struct ring_buffer_per_cpu *cpu_buffer; | 2938 | struct ring_buffer_per_cpu *cpu_buffer; |
2939 | struct buffer_page *bpage; | 2939 | struct buffer_page *bpage; |
2940 | unsigned long ret; | 2940 | u64 ret; |
2941 | 2941 | ||
2942 | if (!cpumask_test_cpu(cpu, buffer->cpumask)) | 2942 | if (!cpumask_test_cpu(cpu, buffer->cpumask)) |
2943 | return 0; | 2943 | return 0; |