ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able

BugLink: http://bugs.launchpad.net/bugs/1720154
commit 60361e12d01676e23a8de89a5ef4a349ae97f616 upstream.

stack_tracer_disable()/stack_tracer_enable() had been using the wrong
name for the config symbol to enable their preempt-debugging checks --
fix with a word swap.

Link: http://lkml.kernel.org/r/20170831154036.4xldyakmmhuts5x7@hatter.bewilderbeest.net
Fixes: 8aaf1ee70e ("tracing: Rename trace_active to disable_stack_tracer and inline its modification")
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 6383115e9d2c5c6459973a1d2d74609aeb438b9f..2e028854bac779c1282b5c7201904ef7194f89a0 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer);
 static inline void stack_tracer_disable(void)
 {
        /* Preemption or interupts must be disabled */
-       if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+       if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
                WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
        this_cpu_inc(disable_stack_tracer);
 }
@@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void)
  */
 static inline void stack_tracer_enable(void)
 {
-       if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+       if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
                WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
        this_cpu_dec(disable_stack_tracer);
 }