xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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

Cc: stable@vger.kernel.org
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>
This commit is contained in:
Zev Weiss
2017-08-30 05:36:38 -05:00
committed by Steven Rostedt (VMware)
parent cc4a41fe55
commit 60361e12d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/ftrace.h
View File

@@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer);
static inline void stack_tracer_disable(void) static inline void stack_tracer_disable(void)
{ {
/* Preemption or interupts must be disabled */ /* 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()); WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
this_cpu_inc(disable_stack_tracer); this_cpu_inc(disable_stack_tracer);
} }
@@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void)
*/ */
static inline void stack_tracer_enable(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()); WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
this_cpu_dec(disable_stack_tracer); this_cpu_dec(disable_stack_tracer);
} }