[PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able

From	Zev Weiss <zev@bewilderbeest.net>
Newsgroups	linux.kernel
Subject	[PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able
Date	2017-08-31 09:20 +0200
Message-ID	<ukrVE-2Bh-23@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hello,

It appears stack_tracer_disable()/stack_tracer_enable() have been
using the wrong name for the config symbol to enable their
preempt-debugging checks, which the patch below should fix.  (Noticed
when I made the same mistake attempting to grep for
CONFIG_DEBUG_PREEMPT and got two results instead of zero).


Zev Weiss

---
 include/linux/ftrace.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 6383115e9d2c..2e028854bac7 100644
--- 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);
 }
-- 
2.14.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able Zev Weiss <zev@bewilderbeest.net> - 2017-08-31 09:20 +0200
  Re: [PATCH] ftrace: fix debug config symbol in  stack_tracer_{en,dis}able Steven Rostedt <rostedt@goodmis.org> - 2017-08-31 15:50 +0200
  Re: [PATCH] ftrace: fix debug config symbol in  stack_tracer_{en,dis}able Steven Rostedt <rostedt@goodmis.org> - 2017-08-31 16:00 +0200
    Re: [PATCH] ftrace: fix debug config symbol in  stack_tracer_{en,dis}able Zev Weiss <zev@bewilderbeest.net> - 2017-08-31 17:50 +0200

csiph-web