blob: 11f8056b52d47687e1f32433840db13f14bb2caa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From ffc6cfcb55bd92813d161afa754ee95c03ae0388 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>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
init/main.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/init/main.c b/init/main.c
index 57af5bc..3cc95fd 100644
--- a/init/main.c
+++ b/init/main.c
@@ -917,7 +917,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");
@@ -931,14 +931,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.0.4
|
