diff options
| author | John Kacur <jkacur@redhat.com> | 2010-04-28 21:34:27 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-28 22:54:11 +0200 |
| commit | f4c30135fddb7d23d26f722b6f50e251d8764414 (patch) | |
| tree | 8d2e8c09383e75871f7a7498afd42a152b570529 | |
| parent | 6994dafc593b03419e3b490805d1d7c418990ab5 (diff) | |
| download | lwn-f4c30135fddb7d23d26f722b6f50e251d8764414.tar.gz lwn-f4c30135fddb7d23d26f722b6f50e251d8764414.zip | |
rt: Remove irrelevant CONFIGS from reminder block.
- 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>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Clark Williams <williams@redhat.com>
LKML-Reference: <1272483267-10900-1-git-send-email-jkacur@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | init/main.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/init/main.c b/init/main.c index 592c16a5caa4..622fe30bda69 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 |