From: tip-bot for Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
To: linux-tip-commits@vger.kernel.org
Cc: vnagarnaik@google.com, linux-kernel@vger.kernel.org,
hpa@zytor.com, mingo@kernel.org, fweisbec@gmail.com,
yoshihiro.yunomae.ez@hitachi.com, rostedt@goodmis.org,
dhsharp@google.com, tglx@linutronix.de
Subject: [tip:perf/core] ring-buffer: Change unsigned long type of ring_buffer_oldest_event_ts() to u64
Date: Tue, 13 Nov 2012 23:03:52 -0800 [thread overview]
Message-ID: <tip-50ecf2c3afead23a05227ab004e4212eca08c207@git.kernel.org> (raw)
In-Reply-To: <1349998076-15495-5-git-send-email-dhsharp@google.com>
Commit-ID: 50ecf2c3afead23a05227ab004e4212eca08c207
Gitweb: http://git.kernel.org/tip/50ecf2c3afead23a05227ab004e4212eca08c207
Author: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
AuthorDate: Thu, 11 Oct 2012 16:27:54 -0700
Committer: Steven Rostedt <rostedt@goodmis.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@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>
---
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;
next prev parent reply other threads:[~2012-11-14 7:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-11 23:27 [PATCH v6 0/6] TSC trace_clock David Sharp
2012-10-11 23:27 ` [PATCH v6 1/6] tracing,x86: Add a " David Sharp
2012-10-12 5:05 ` Geert Uytterhoeven
2012-10-12 11:41 ` Steven Rostedt
2012-10-15 19:05 ` David Sharp
2012-10-16 20:05 ` [PATCH v7 1/5] " David Sharp
2012-10-15 21:42 ` [PATCH v6 1/6] " David Sharp
2012-10-16 12:53 ` David Howells
2012-10-16 20:02 ` David Sharp
2012-10-11 23:27 ` [PATCH v6 2/6] tracing: Reset ring buffer when changing trace_clocks David Sharp
2012-11-14 7:02 ` [tip:perf/core] " tip-bot for David Sharp
2012-10-11 23:27 ` [PATCH v6 3/6] tracing: Format non-nanosec times from tsc clock without a decimal point David Sharp
2012-10-11 23:27 ` [PATCH v6 4/6] ftrace: Change unsigned long type of ring_buffer_oldest_event_ts() to u64 David Sharp
2012-11-14 7:03 ` tip-bot for Yoshihiro YUNOMAE [this message]
2012-10-11 23:27 ` [PATCH v6 5/6] ftrace: Show raw time stamp on stats per cpu using counter or tsc mode for trace_clock David Sharp
2012-10-11 23:27 ` [PATCH v6 6/6] tracing: Fix maybe-uninitialized warning in ftrace_function_set_regexp David Sharp
2012-10-12 1:36 ` Steven Rostedt
2012-10-12 2:33 ` David Sharp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-50ecf2c3afead23a05227ab004e4212eca08c207@git.kernel.org \
--to=yoshihiro.yunomae.ez@hitachi.com \
--cc=dhsharp@google.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=vnagarnaik@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox