diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-17 14:11:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-17 14:11:15 +0100 |
| commit | 5beda5f6e4e4523e8dbe596bf163a01b45776808 (patch) | |
| tree | 61d1551430687b712325cdfec81b7800aa759076 /kernel/trace/ring_buffer.c | |
| parent | ba3dd36c6775264ee6e7354ba1aabcd6e86d7298 (diff) | |
| parent | 6752ab4a9c30d5411b2dfdb251a3f1cb18aae487 (diff) | |
| download | kernel_samsung_smdk4412-5beda5f6e4e4523e8dbe596bf163a01b45776808.zip kernel_samsung_smdk4412-5beda5f6e4e4523e8dbe596bf163a01b45776808.tar.gz kernel_samsung_smdk4412-5beda5f6e4e4523e8dbe596bf163a01b45776808.tar.bz2 | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index bd1c35a..7739893 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2163,10 +2163,14 @@ 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", + KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n%s", (unsigned long long)delta, (unsigned long long)ts, - (unsigned long long)cpu_buffer->write_stamp); + (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"); add_timestamp = 1; } } |