diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-18 10:09:49 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-18 10:09:49 +0300 |
| commit | e9345aab675382176740bc8a2c6d3caf1510e46d (patch) | |
| tree | ebfe68433e1d2f326fafbb0cf01ef2c061cdb356 /kernel/trace | |
| parent | bee96907383e71d3996ba2bd0682fefaa492d942 (diff) | |
| download | linux-e9345aab675382176740bc8a2c6d3caf1510e46d.tar.xz | |
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>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 8 |
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, delta = diff; if (unlikely(test_time_stamp(delta))) { WARN_ONCE(delta > (1ULL << 59), - KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n%s", + KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n", (unsigned long long)delta, (unsigned long long)ts, - (unsigned long long)cpu_buffer->write_stamp, - sched_clock_stable ? "" : - "If you just came from a suspend/resume,\n" - "please switch to the trace global clock:\n" - " echo global > /sys/kernel/debug/tracing/trace_clock\n"); + (unsigned long long)cpu_buffer->write_stamp); add_timestamp = 1; } } |