Re: [tip:perf/core] Revert "tracing: Add unstable sched clock note to the warning"

Re: [tip:perf/core] Revert "tracing: Add unstable sched clock note to the warning"

[Jiri Olsa]

oops, overlooked this one... will send new patch shortly, sorry

jirka

On Fri, Feb 18, 2011 at 10:39:12AM +0000, tip-bot for Ingo Molnar wrote:
> Commit-ID:  e9345aab675382176740bc8a2c6d3caf1510e46d
> Gitweb:     http://git.kernel.org/tip/e9345aab675382176740bc8a2c6d3caf1510e46d
> Author:     Ingo Molnar <mingo@elte.hu>
> AuthorDate: Fri, 18 Feb 2011 08:09:49 +0100
> Committer:  Ingo Molnar <mingo@elte.hu>
> CommitDate: Fri, 18 Feb 2011 08:09:49 +0100
> 
> 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>
> ---
>  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 7739893..bd1c35a 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;
>  		}
>  	}