From: Joel Fernandes <joelaf@google.com>
To: linux-kernel@vger.kernel.org
Cc: Joel Fernandes <joelaf@google.com>,
Steven Rostedt <rostedt@goodmis.org>,
Peter Zijlstra <peterz@infradead.org>,
kernel-team@android.com, Ingo Molnar <mingo@redhat.com>
Subject: [PATCH RFC v4 3/3] ftrace: Use correct config option for preemption debug
Date: Wed, 6 Sep 2017 17:17:52 -0700 [thread overview]
Message-ID: <20170907001752.27015-4-joelaf@google.com> (raw)
In-Reply-To: <20170907001752.27015-1-joelaf@google.com>
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
prev parent reply other threads:[~2017-09-07 0:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-07 0:17 [PATCH RFC v4 0/3] tracing: Add trace events for preemption and irq disable/enable Joel Fernandes
2017-09-07 0:17 ` [PATCH RFC v4 1/3] tracing/irqsoff: Prepare to add preempt and irq trace events Joel Fernandes
2017-09-10 9:06 ` Steven Rostedt
2017-09-10 22:21 ` Joel Fernandes
2017-09-07 0:17 ` [PATCH RFC v4 2/3] tracing: Add support for preempt and irq enable/disable events Joel Fernandes
2017-09-07 0:17 ` Joel Fernandes [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170907001752.27015-4-joelaf@google.com \
--to=joelaf@google.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).