From: John Kacur <jkacur@redhat.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Kacur <jkacur@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Steven Rostedt <rostedt@goodmis.org>,
Clark Williams <williams@redhat.com>
Subject: [PATCH] rt: Fix the reminder block accounting for CONFIG_FUNCTION_TRACER
Date: Thu, 29 Apr 2010 22:07:32 +0200 [thread overview]
Message-ID: <1272571652-5719-1-git-send-email-jkacur@redhat.com> (raw)
Make the accounting for CONFIG_FUNCTION_TRACER in DEBUG_COUNT
match that in the reminder block reporting.
Signed-off-by: John Kacur <jkacur@redhat.com>
---
init/main.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/init/main.c b/init/main.c
index 622fe30..d4b3bf5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -908,15 +908,17 @@ static int __init kernel_init(void * unused)
WARN_ON(irqs_disabled());
#endif
-#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + \
- defined(CONFIG_IRQSOFF_TRACER) + \
- defined(CONFIG_PREEMPT_TRACER) + \
- defined(CONFIG_FUNCTION_TRACER) + \
- defined(CONFIG_INTERRUPT_OFF_HIST) + \
- defined(CONFIG_PREEMPT_OFF_HIST) + \
- defined(CONFIG_DEBUG_SLAB) + \
- defined(CONFIG_PREEMPT_OFF_HIST) + \
- defined(CONFIG_LOCKDEP))
+#define DEBUG_COUNT ( \
+ defined(CONFIG_DEBUG_RT_MUTEXES) + \
+ defined(CONFIG_IRQSOFF_TRACER) + \
+ defined(CONFIG_PREEMPT_TRACER) + \
+ defined(CONFIG_INTERRUPT_OFF_HIST) + \
+ defined(CONFIG_PREEMPT_OFF_HIST) + \
+ defined(CONFIG_DEBUG_SLAB) + \
+ defined(CONFIG_PREEMPT_OFF_HIST) + \
+ defined(CONFIG_LOCKDEP) + \
+ (defined(CONFIG_FUNCTION_TRACER) - \
+ defined(CONFIG_FTRACE_MCOUNT_RECORD)))
#if DEBUG_COUNT > 0
printk(KERN_ERR "*****************************************************************************\n");
@@ -936,7 +938,7 @@ static int __init kernel_init(void * unused)
#ifdef CONFIG_PREEMPT_TRACER
printk(KERN_ERR "* CONFIG_PREEMPT_TRACER *\n");
#endif
-#if defined(CONFIG_FTRACE) && !defined(CONFIG_FTRACE_MCOUNT_RECORD)
+#if defined(CONFIG_FUNCTION_TRACER) && !defined(CONFIG_FTRACE_MCOUNT_RECORD)
printk(KERN_ERR "* CONFIG_FUNCTION_TRACER *\n");
#endif
#ifdef CONFIG_INTERRUPT_OFF_HIST
--
1.6.6.1
reply other threads:[~2010-04-30 21:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1272571652-5719-1-git-send-email-jkacur@redhat.com \
--to=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/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
all inboxes | Powered by JetHome®