From 4fdd3199498e41f466c4c8f97c55a9d151df8bc4 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Wed, 2 Feb 2011 13:28:18 +0100 Subject: [PATCH] --- yaml --- r: 234435 b: refs/heads/master c: 5e38ca8f3ea423442eaafe1b7e206084aa38120a h: refs/heads/master i: 234433: 4608a11bd566bdf7378dfb1ed66b30e63d7898d3 234431: 21d26d613e05c770332a9f3543d22822435ad76c v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 58049972107b..11197f57b8ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae07f551c42d6e4162436ca452a199deac9dab4d +refs/heads/master: 5e38ca8f3ea423442eaafe1b7e206084aa38120a diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index bd1c35a4fbcc..7739893a1d0a 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/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; } }