Skip to content

Commit 60361e1

Browse files
zevweissrostedt
authored andcommitted
ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able
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/[email protected] Cc: [email protected] Fixes: 8aaf1ee ("tracing: Rename trace_active to disable_stack_tracer and inline its modification") Signed-off-by: Zev Weiss <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent cc4a41f commit 60361e1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/linux/ftrace.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer);
307307
static inline void stack_tracer_disable(void)
308308
{
309309
/* Preemption or interupts must be disabled */
310-
if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
310+
if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
311311
WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
312312
this_cpu_inc(disable_stack_tracer);
313313
}
@@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void)
320320
*/
321321
static inline void stack_tracer_enable(void)
322322
{
323-
if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
323+
if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
324324
WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
325325
this_cpu_dec(disable_stack_tracer);
326326
}

0 commit comments

Comments
 (0)