[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20090812102843.1e0c6d73@torg>
Date: Wed, 12 Aug 2009 10:28:43 -0500
From: Clark Williams <williams@...hat.com>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: RT <linux-rt-users@...r.kernel.org>,
John Kacur <jkacur@...hat.com>,
Steven Rostedt <srostedt@...hat.com>,
LKML <linux-kernel@...r.kernel.org>
Subject: [RT PATCH] Changed boot warning to look for CONFIG_FUNCTION &&
!CONFIG_DYNAMIC_FTRACE
Thomas,
After a conversation with Steven, I changed the boot warning for
configs that may hurt performance to look for CONFIG_FUNCTION
&& !CONFIG_DYNAMIC_FTRACE, rather than just CONFIG_FTRACE.
Signed-off-by: Clark Williams <williams@...hat.com>
---
init/main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/init/main.c b/init/main.c
index a04e102..9a0d510 100644
--- a/init/main.c
+++ b/init/main.c
@@ -935,7 +935,7 @@ 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_STACK_TRACER) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
+#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) + defined(CONFIG_STACK_TRACER) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FUNCTION) - defined(CONFIG_DYNAMIC_FTRACE)))
#if DEBUG_COUNT > 0
printk(KERN_ERR "*****************************************************************************\n");
@@ -955,8 +955,8 @@ static int __init kernel_init(void * unused)
#ifdef CONFIG_PREEMPT_TRACER
printk(KERN_ERR "* CONFIG_PREEMPT_TRACER *\n");
#endif
-#ifdef CONFIG_FTRACE
- printk(KERN_ERR "* CONFIG_FTRACE *\n");
+#if defined(CONFIG_FUNCTION) && !defined(CONFIG_DYNAMIC_FTRACE)
+ printk(KERN_ERR "* CONFIG_FUNCTION *\n");
#endif
#ifdef CONFIG_WAKEUP_LATENCY_HIST
printk(KERN_ERR "* CONFIG_WAKEUP_LATENCY_HIST *\n");
--
1.6.2.5
Download attachment "signature.asc" of type "application/pgp-signature" (199 bytes)
Powered by blists - more mailing lists