From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Kacur Subject: Re: [PATCH] rt: Remove irrelevant CONFIGS from reminder block. Date: Thu, 29 Apr 2010 20:39:22 +0200 (CEST) Message-ID: References: <1272483267-10900-1-git-send-email-jkacur@redhat.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: lkml , rt-users , Steven Rostedt , Clark Williams To: Thomas Gleixner Return-path: In-Reply-To: <1272483267-10900-1-git-send-email-jkacur@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-rt-users.vger.kernel.org Thomas: this should fix the accounting for the FUNCTION_TRACER that was incorrect in the previous version of the patch. Thanks >>From 93805bbedd83bf34466e738a6addccb44735ed20 Mon Sep 17 00:00:00 2001 From: John Kacur Date: Wed, 28 Apr 2010 21:25:14 +0200 Subject: [PATCH] rt: Remove irrelevant CONFIGS from reminder block. Cc: Thomas Gleixner , Steven Rostedt , Clark Williams - remove CONFIGS that do not have an impact to -rt from the reminder block. - reformat DEBUG_COUNT so that it is more easily human readable. - correct CONFIG_FTRACE to CONFIG_FUNCTION_TRACER. Signed-off-by: John Kacur --- init/main.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/init/main.c b/init/main.c index 592c16a..d4b3bf5 100644 --- a/init/main.c +++ b/init/main.c @@ -908,7 +908,17 @@ 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_DEBUG_SLAB) + \ + defined(CONFIG_PREEMPT_OFF_HIST) + \ + defined(CONFIG_LOCKDEP) + \ + (defined(CONFIG_FUNCTION_TRACER) - \ + defined(CONFIG_FTRACE_MCOUNT_RECORD))) #if DEBUG_COUNT > 0 printk(KERN_ERR "*****************************************************************************\n"); @@ -928,11 +938,8 @@ 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"); +#if defined(CONFIG_FUNCTION_TRACER) && !defined(CONFIG_FTRACE_MCOUNT_RECORD) + printk(KERN_ERR "* CONFIG_FUNCTION_TRACER *\n"); #endif #ifdef CONFIG_INTERRUPT_OFF_HIST printk(KERN_ERR "* CONFIG_INTERRUPT_OFF_HIST *\n"); @@ -940,9 +947,6 @@ static int __init kernel_init(void * unused) #ifdef CONFIG_PREEMPT_OFF_HIST printk(KERN_ERR "* CONFIG_PREEMPT_OFF_HIST *\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"); #endif -- 1.6.6.1