[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-50ecf2c3afead23a05227ab004e4212eca08c207@git.kernel.org>
Date: Tue, 13 Nov 2012 23:03:52 -0800
From: tip-bot for Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@...achi.com>
To: linux-tip-commits@...r.kernel.org
Cc: vnagarnaik@...gle.com, linux-kernel@...r.kernel.org, hpa@...or.com,
mingo@...nel.org, fweisbec@...il.com,
yoshihiro.yunomae.ez@...achi.com, rostedt@...dmis.org,
dhsharp@...gle.com, tglx@...utronix.de
Subject: [tip:perf/core] ring-buffer:
Change unsigned long type of ring_buffer_oldest_event_ts() to u64
Commit-ID: 50ecf2c3afead23a05227ab004e4212eca08c207
Gitweb: http://git.kernel.org/tip/50ecf2c3afead23a05227ab004e4212eca08c207
Author: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@...achi.com>
AuthorDate: Thu, 11 Oct 2012 16:27:54 -0700
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Fri, 2 Nov 2012 10:21:48 -0400
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@...il.com>
Cc: Vaibhav Nagarnaik <vnagarnaik@...gle.com>
Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@...achi.com>
Signed-off-by: David Sharp <dhsharp@...gle.com>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
include/linux/ring_buffer.h | 2 +-
kernel/trace/ring_buffer.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index 2007375..519777e 100644
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -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);
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 23a384b..3c7834c 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)
* @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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists