[rt: PATCH - resend] Fix-up boot-up warnings surrounding CONFIG_STACK_TRACER

[rt: PATCH - resend] Fix-up boot-up warnings surrounding CONFIG_STACK_TRACER

[John Kacur]

Thomas

I respun this against 2.6.33.2-rt13 and combined the two original patches
into one as suggested by Steven Rostedt, and added his Acked-by.

Please consider this patch for the next -rt release.

Thanks

John Kacur (1):
  rt: This fixes the boot-up messages related to CONFIG_STACK_TRACER

 init/main.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

[PATCH] rt: This fixes the boot-up messages related to CONFIG_STACK_TRACER

[John Kacur]

Summary:
- No warning is necessary for CONFIG_STACK_TRACER because it is not enabled by
default anymore.
- The reason it was put back was to fix a problem where there was an
empty REMINDER message about debug options that cause overhead. This is
properly fixed by removing CONFIG_STACK_TRACER from the DEBUG_COUNT

Revert "rt: trivial fix to REMINDER block in init/main.c"

This reverts commit 3e39399ef4a742d994570488994be93ef17d4ef5.

CONFIG_STACK_TRACER really should not be in the reminder block.
By default it is not enabled, and has negligible impact.

Signed-off-by: John Kacur <jkacur@redhat.com>

rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT

Remove CONFIG_STACK_TRACER from DEBUG_COUNT so that reminder messages
are printed correctly, and don't leave an empty reminder block for example.

Signed-off-by: John Kacur <jkacur@redhat.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
---
 init/main.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/init/main.c b/init/main.c
index 592c16a..f26cb63 100644
--- a/init/main.c
+++ b/init/main.c
@@ -908,7 +908,7 @@ 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_STACK_TRACER) + defined(CONFIG_INTERRUPT_OFF_HIST) + defined(CONFIG_PREEMPT_OFF_HIST) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
+#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_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");
@@ -928,9 +928,6 @@ static int __init kernel_init(void * unused)
 #ifdef CONFIG_PREEMPT_TRACER
 	printk(KERN_ERR "*        CONFIG_PREEMPT_TRACER                                              *\n");
 #endif
-#ifdef CONFIG_STACK_TRACER
-	printk(KERN_ERR "*        CONFIG_STACK_TRACER                                                *\n");
-#endif
 #if defined(CONFIG_FTRACE) && !defined(CONFIG_FTRACE_MCOUNT_RECORD)
 	printk(KERN_ERR "*        CONFIG_FTRACE                                                      *\n");
 #endif
-- 
1.6.6.1