Revert "tracing: Add unstable sched clock note to the warning"
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Feb 2011 07:09:49 +0000 (08:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Feb 2011 07:09:49 +0000 (08:09 +0100)
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>
kernel/trace/ring_buffer.c

index 7739893a1d0a82630b53b121ea015873ba5101dd..bd1c35a4fbccf31c0531f0667545011f704c561f 100644 (file)
@@ -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;
                }
        }