From af17e16ed25d0a84433bbf2d28767e249f29c374 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Fri, 18 Feb 2011 15:52:19 +0100 Subject: [PATCH] --- yaml --- r: 234527 b: refs/heads/master c: 31274d72f01604f4b02d933b4f3cac84d2c201fd h: refs/heads/master i: 234525: 78aac14af4446945a5a843de25db76c8ec9cf041 234523: d98fc087e9646ef8e1cfbbbc60c01669ac667a64 234519: b8cdb4f1ebb2ab6d990f9341892246fe98fb334c 234511: 565a53e7e7968fb859206fe1bb174a63f1fe22fe 234495: 17e522513e3f851e47435721b330b74bd722ee84 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 328a681005f4..f7ff0e9ceb2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 722b3c74695377d11d18a52f3da08114d37f3f37 +refs/heads/master: 31274d72f01604f4b02d933b4f3cac84d2c201fd diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index 3237d961d905..db7b439d23ee 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/kernel/trace/ring_buffer.c @@ -2172,11 +2172,19 @@ rb_reserve_next_event(struct ring_buffer *buffer, if (likely(ts >= cpu_buffer->write_stamp)) { delta = diff; if (unlikely(test_time_stamp(delta))) { + int local_clock_stable = 1; +#ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK + local_clock_stable = sched_clock_stable; +#endif 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, + local_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; } }