aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2018-04-04 17:24:50 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-04-06 08:56:53 -0400
commit5125eee4e698f02b8e1a364ad5d7560f908d855f (patch)
tree2310e1882a7603e2a96a8bec286052ce8d9e9fb3 /kernel/trace/trace.c
parentf7a1570da91558fb85b61e53243fe3fa79e2bbae (diff)
tracing: Fixup logic inversion on setting trace_global_clock defaults
In commit 932066a15335 ("tracing: Default to using trace_global_clock if sched_clock is unstable"), the logic for deciding to override the default clock if unstable was reversed from the earlier posting. I was trying to reduce the width of the message by using an early return rather than a if-block, but reverted back to using the if-block and accidentally left the predicate inverted. Link: http://lkml.kernel.org/r/20180404212450.26646-1-chris@chris-wilson.co.uk Fixes: 932066a15335 ("tracing: Default to using trace_global_clock if sched_clock is unstable") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 0f47e653ffd8..e18e69183c9a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -8602,7 +8602,7 @@ late_initcall_sync(clear_boot_tracer);
8602__init static int tracing_set_default_clock(void) 8602__init static int tracing_set_default_clock(void)
8603{ 8603{
8604 /* sched_clock_stable() is determined in late_initcall */ 8604 /* sched_clock_stable() is determined in late_initcall */
8605 if (trace_boot_clock || sched_clock_stable()) { 8605 if (!trace_boot_clock && !sched_clock_stable()) {
8606 printk(KERN_WARNING 8606 printk(KERN_WARNING
8607 "Unstable clock detected, switching default tracing clock to \"global\"\n" 8607 "Unstable clock detected, switching default tracing clock to \"global\"\n"
8608 "If you want to keep using the local clock, then add:\n" 8608 "If you want to keep using the local clock, then add:\n"