diff options
| -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) | |||
| 908 | WARN_ON(irqs_disabled()); | 908 | WARN_ON(irqs_disabled()); |
| 909 | #endif | 909 | #endif |
| 910 | 910 | ||
| 911 | #define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + \ | 911 | #define DEBUG_COUNT ( \ |
| 912 | defined(CONFIG_IRQSOFF_TRACER) + \ | 912 | defined(CONFIG_DEBUG_RT_MUTEXES) + \ |
| 913 | defined(CONFIG_PREEMPT_TRACER) + \ | 913 | defined(CONFIG_IRQSOFF_TRACER) + \ |
| 914 | defined(CONFIG_FUNCTION_TRACER) + \ | 914 | defined(CONFIG_PREEMPT_TRACER) + \ |
| 915 | defined(CONFIG_INTERRUPT_OFF_HIST) + \ | 915 | defined(CONFIG_INTERRUPT_OFF_HIST) + \ |
| 916 | defined(CONFIG_PREEMPT_OFF_HIST) + \ | 916 | defined(CONFIG_PREEMPT_OFF_HIST) + \ |
| 917 | defined(CONFIG_DEBUG_SLAB) + \ | 917 | defined(CONFIG_DEBUG_SLAB) + \ |
| 918 | defined(CONFIG_PREEMPT_OFF_HIST) + \ | 918 | defined(CONFIG_PREEMPT_OFF_HIST) + \ |
| 919 | defined(CONFIG_LOCKDEP)) | 919 | defined(CONFIG_LOCKDEP) + \ |
| 920 | (defined(CONFIG_FUNCTION_TRACER) - \ | ||
| 921 | defined(CONFIG_FTRACE_MCOUNT_RECORD))) | ||
| 920 | 922 | ||
| 921 | #if DEBUG_COUNT > 0 | 923 | #if DEBUG_COUNT > 0 |
| 922 | printk(KERN_ERR "*****************************************************************************\n"); | 924 | printk(KERN_ERR "*****************************************************************************\n"); |
| @@ -936,7 +938,7 @@ static int __init kernel_init(void * unused) | |||
| 936 | #ifdef CONFIG_PREEMPT_TRACER | 938 | #ifdef CONFIG_PREEMPT_TRACER |
| 937 | printk(KERN_ERR "* CONFIG_PREEMPT_TRACER *\n"); | 939 | printk(KERN_ERR "* CONFIG_PREEMPT_TRACER *\n"); |
| 938 | #endif | 940 | #endif |
| 939 | #if defined(CONFIG_FTRACE) && !defined(CONFIG_FTRACE_MCOUNT_RECORD) | 941 | #if defined(CONFIG_FUNCTION_TRACER) && !defined(CONFIG_FTRACE_MCOUNT_RECORD) |
| 940 | printk(KERN_ERR "* CONFIG_FUNCTION_TRACER *\n"); | 942 | printk(KERN_ERR "* CONFIG_FUNCTION_TRACER *\n"); |
| 941 | #endif | 943 | #endif |
| 942 | #ifdef CONFIG_INTERRUPT_OFF_HIST | 944 | #ifdef CONFIG_INTERRUPT_OFF_HIST |