aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-18 02:09:49 -0500
committerIngo Molnar <mingo@elte.hu>2011-02-18 02:09:49 -0500
commite9345aab675382176740bc8a2c6d3caf1510e46d (patch)
treeebfe68433e1d2f326fafbb0cf01ef2c061cdb356
parentbee96907383e71d3996ba2bd0682fefaa492d942 (diff)
Revert "tracing: Add unstable sched clock note to the warning"
This reverts commit 5e38ca8f3ea423442eaafe1b7e206084aa38120a. Breaks the build of several !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK architectures. Cc: Jiri Olsa <jolsa@redhat.com> Cc: Steven Rostedt <rostedt@goodmis.org> Message-ID: <20110217171823.GB17058@elte.hu> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/ring_buffer.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 7739893a1d0a..bd1c35a4fbcc 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2163,14 +2163,10 @@ rb_reserve_next_event(struct ring_buffer *buffer,
2163 delta = diff; 2163 delta = diff;
2164 if (unlikely(test_time_stamp(delta))) { 2164 if (unlikely(test_time_stamp(delta))) {
2165 WARN_ONCE(delta > (1ULL << 59), 2165 WARN_ONCE(delta > (1ULL << 59),
2166 KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n%s", 2166 KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n",
2167 (unsigned long long)delta, 2167 (unsigned long long)delta,
2168 (unsigned long long)ts, 2168 (unsigned long long)ts,
2169 (unsigned long long)cpu_buffer->write_stamp, 2169 (unsigned long long)cpu_buffer->write_stamp);
2170 sched_clock_stable ? "" :
2171 "If you just came from a suspend/resume,\n"
2172 "please switch to the trace global clock:\n"
2173 " echo global > /sys/kernel/debug/tracing/trace_clock\n");
2174 add_timestamp = 1; 2170 add_timestamp = 1;
2175 } 2171 }
2176 } 2172 }