linux-kernel - [PATCH] rt: Fix the reminder block accounting for CONFIG_FUNCTION

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 29 Apr 2010 22:07:32 +0200
From:	John Kacur <jkacur@...hat.com>
To:	lkml <linux-kernel@...r.kernel.org>
Cc:	John Kacur <jkacur@...hat.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Steven Rostedt <rostedt@...dmis.org>,
	Clark Williams <williams@...hat.com>
Subject: [PATCH] rt: Fix the reminder block accounting for CONFIG_FUNCTION_TRACER

Make the accounting for CONFIG_FUNCTION_TRACER in DEBUG_COUNT
match that in the reminder block reporting.

Signed-off-by: John Kacur <jkacur@...hat.com>
---
 init/main.c |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/init/main.c b/init/main.c
index 622fe30..d4b3bf5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -908,15 +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_FUNCTION_TRACER) +	\
-			defined(CONFIG_INTERRUPT_OFF_HIST) +	\
-			defined(CONFIG_PREEMPT_OFF_HIST) +	\
-			defined(CONFIG_DEBUG_SLAB) +		\
-			defined(CONFIG_PREEMPT_OFF_HIST) +	\
-			defined(CONFIG_LOCKDEP))
+#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");
@@ -936,7 +938,7 @@ static int __init kernel_init(void * unused)
 #ifdef CONFIG_PREEMPT_TRACER
 	printk(KERN_ERR "*        CONFIG_PREEMPT_TRACER                                              *\n");
 #endif
-#if defined(CONFIG_FTRACE) && !defined(CONFIG_FTRACE_MCOUNT_RECORD)
+#if defined(CONFIG_FUNCTION_TRACER) && !defined(CONFIG_FTRACE_MCOUNT_RECORD)
 	printk(KERN_ERR "*        CONFIG_FUNCTION_TRACER                                              *\n");
 #endif
 #ifdef CONFIG_INTERRUPT_OFF_HIST
-- 
1.6.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/