Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 50ecf2c3afead23a05227ab004e4212eca08c207

Authored by Yoshihiro YUNOMAE
Committed by Steven Rostedt
1 parent 60303ed3f4
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

include/linux/ring_buffer.h
Diff comments   View file @ 50ecf2c
... ... @@ -159,7 +159,7 @@
159 159 void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu);
160 160 void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu);
161 161  
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);
163 163 unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu);
164 164 unsigned long ring_buffer_entries(struct ring_buffer *buffer);
165 165 unsigned long ring_buffer_overruns(struct ring_buffer *buffer);
kernel/trace/ring_buffer.c
Diff comments   View file @ 50ecf2c
... ... @@ -2932,12 +2932,12 @@
2932 2932 * @buffer: The ring buffer
2933 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 2937 unsigned long flags;
2938 2938 struct ring_buffer_per_cpu *cpu_buffer;
2939 2939 struct buffer_page *bpage;
2940   - unsigned long ret;
  2940 + u64 ret;
2941 2941  
2942 2942 if (!cpumask_test_cpu(cpu, buffer->cpumask))
2943 2943 return 0;