Skip to contentSkip to conversation

rt: Fix the reminder block accounting for CONFIG_FUNCTION_TRACER

PATCH New John Kacur 1 participant 1 message Apr 30, 2010

lore
Share & tools
lore

John Kacur

author
#0 lore raw

PATCH 1/1 rt: Fix the reminder block accounting for CONFIG_FUNCTION_TRACER

Make the accounting for CONFIG_FUNCTION_TRACER in DEBUG_COUNT match that in the reminder block reporting.

---
 init/main.c |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)
init/main.c +12 -10
index 622fe30..d4b3bf5 100644
@@ -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
Signature · 1 line
1.6.6.1