diff options
| author | John Kacur <jkacur@redhat.com> | 2010-04-29 22:07:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-30 11:39:34 +0200 |
| commit | 4c8acb4123ce8dadfc12011613469a5eded09aed (patch) | |
| tree | 18b8fea55d1b8254d63535fa7f55f3c8f6e205f9 | |
| parent | 4eba98c7aaf7de711d4d18ecf80650d84edad3b2 (diff) | |
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.
Signed-off-by: John Kacur <jkacur@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Clark Williams <williams@redhat.com>
LKML-Reference: <1272571652-5719-1-git-send-email-jkacur@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | init/main.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/init/main.c b/init/main.c index 622fe30bda69..d4b3bf506dcb 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 |