summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-07-03 08:44:25 -0500
committerThomas Gleixner <tglx@linutronix.de>2009-07-29 23:30:43 +0200
commitb22c2ff3f3cf9cbd1cc4c432d0eebbd490cf5538 (patch)
treec3992343d1f12aa803b4dc9bbfc991464d6aaf04 /init
parentdea2d9a0550f1a8da36a380567b61de9d9a83208 (diff)
downloadlwn-b22c2ff3f3cf9cbd1cc4c432d0eebbd490cf5538.tar.gz
lwn-b22c2ff3f3cf9cbd1cc4c432d0eebbd490cf5538.zip
init: emit preempt warn about tracing
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
-rw-r--r--init/main.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/init/main.c b/init/main.c
index 03aab770c824..a04e1023e97d 100644
--- a/init/main.c
+++ b/init/main.c
@@ -935,7 +935,7 @@ static int __init kernel_init(void * unused)
WARN_ON(irqs_disabled());
#endif
-#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + defined(CONFIG_CRITICAL_PREEMPT_TIMING) + defined(CONFIG_CRITICAL_IRQSOFF_TIMING) + defined(CONFIG_FUNCTION_TRACE) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP))
+#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) + defined(CONFIG_STACK_TRACER) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
#if DEBUG_COUNT > 0
printk(KERN_ERR "*****************************************************************************\n");
@@ -949,14 +949,17 @@ static int __init kernel_init(void * unused)
#ifdef CONFIG_DEBUG_RT_MUTEXES
printk(KERN_ERR "* CONFIG_DEBUG_RT_MUTEXES *\n");
#endif
-#ifdef CONFIG_CRITICAL_PREEMPT_TIMING
- printk(KERN_ERR "* CONFIG_CRITICAL_PREEMPT_TIMING *\n");
+#ifdef CONFIG_IRQSOFF_TRACER
+ printk(KERN_ERR "* CONFIG_IRQSOFF_TRACER *\n");
#endif
-#ifdef CONFIG_CRITICAL_IRQSOFF_TIMING
- printk(KERN_ERR "* CONFIG_CRITICAL_IRQSOFF_TIMING *\n");
+#ifdef CONFIG_PREEMPT_TRACER
+ printk(KERN_ERR "* CONFIG_PREEMPT_TRACER *\n");
#endif
-#ifdef CONFIG_FUNCTION_TRACE
- printk(KERN_ERR "* CONFIG_FUNCTION_TRACE *\n");
+#ifdef CONFIG_FTRACE
+ printk(KERN_ERR "* CONFIG_FTRACE *\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");