[PATCH RFC v4 3/3] ftrace: Use correct config option for preemption debug

From	Joel Fernandes <joelaf@google.com>
Newsgroups	linux.kernel
Subject	[PATCH RFC v4 3/3] ftrace: Use correct config option for preemption debug
Date	2017-09-07 02:20 +0200
Message-ID	<umSI1-EN-5@gated-at.bofh.it> (permalink)
References	<umSI1-EN-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

I notice that CONFIG_PREEMPT_DEBUG doesn't exist, though this code uses it. I
think it wants CONFIG_DEBUG_PREEMPT. Replace it with the same.

Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel-team@android.com
Signed-off-by: Joel Fernandes <joelaf@google.com>
---
 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 5790ba7a85bd..768e49b8c80f 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.581.gf28d330327-goog

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

Thread

[PATCH RFC v4 3/3] ftrace: Use correct config option for preemption debug Joel Fernandes <joelaf@google.com> - 2017-09-07 02:20 +0200

csiph-web