[PATCH] rt: Remove irrelevant CONFIGS from reminder block.

John Kacur
2010-04-28T19:34:40Z

- remove CONFIGS that do not have an impact to -rt from the reminder block.
- reformat DEBUG_COUNT so that it is more easily human readable.
- correct CONFIG_FTRACE to CONFIG_FUNCTION_TRACER.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
init/main.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/init/main.c b/init/main.c
index 592c16a..622fe30 100644
--- a/init/main.c
+++ b/init/main.c
@@ -908,7 +908,15 @@ 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_INTERRUPT_OFF_HIST) + defined(CONFIG_PREEMPT_OFF_HIST) + 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_FUNCTION_TRACER) + \
+ defined(CONFIG_INTERRUPT_OFF_HIST) + \
+ defined(CONFIG_PREEMPT_OFF_HIST) + \
+ defined(CONFIG_DEBUG_SLAB) + \
+ defined(CONFIG_PREEMPT_OFF_HIST) + \
+ defined(CONFIG_LOCKDEP))

#if DEBUG_COUNT > 0
printk(KERN_ERR "*****************************************************************************\n");
@@ -928,11 +936,8 @@ static int __init kernel_init(void * unused)
#ifdef CONFIG_PREEMPT_TRACER
printk(KERN_ERR "* CONFIG_PREEMPT_TRACER *\n");
#endif
-#ifdef CONFIG_STACK_TRACER
- printk(KERN_ERR "* CONFIG_STACK_TRACER *\n");
-#endif
#if defined(CONFIG_FTRACE) && !defined(CONFIG_FTRACE_MCOUNT_RECORD)
- printk(KERN_ERR "* CONFIG_FTRACE *\n");
+ printk(KERN_ERR "* CONFIG_FUNCTION_TRACER *\n");
#endif
#ifdef CONFIG_INTERRUPT_OFF_HIST
printk(KERN_ERR "* CONFIG_INTERRUPT_OFF_HIST *\n");
@@ -940,9 +945,6 @@ static int __init kernel_init(void * unused)
#ifdef CONFIG_PREEMPT_OFF_HIST
printk(KERN_ERR "* CONFIG_PREEMPT_OFF_HIST *\n");
#endif
-#ifdef CONFIG_WAKEUP_LATENCY_HIST
- printk(KERN_ERR "* CONFIG_WAKEUP_LATENCY_HIST *\n");
-#endif
#ifdef CONFIG_DEBUG_SLAB
printk(KERN_ERR "* CONFIG_DEBUG_SLAB *\n");
#endif
--
1.6.6.1