| From cf232cc5bf1e5a74b4ae5c6bf1395b7aee8b01c8 Mon Sep 17 00:00:00 2001 |
| From: Ingo Molnar <mingo@elte.hu> |
| Date: Fri, 3 Jul 2009 08:44:25 -0500 |
| Subject: [PATCH] init: emit preempt warn about tracing |
| |
| commit b22c2ff3f3cf9cbd1cc4c432d0eebbd490cf5538 in tip. |
| |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/init/main.c b/init/main.c |
| index 2a09cb6..ed4c511 100644 |
| --- a/init/main.c |
| +++ b/init/main.c |
| @@ -899,7 +899,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"); |
| @@ -913,14 +913,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"); |
| -- |
| 1.7.1.1 |
| |
