[PATCH][GIT PULL] tracing/lockdep: Fix dependency of TRACE_IRQFLAGS

[Steven Rostedt]

Ingo,

This only fixes a build warning, so I'm guessing that it can wait till
2.6.37. If you think otherwise, I could add it to my tip/perf/urgent
branch instead.

Please pull the latest tip/perf/core tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/core


Steven Rostedt (1):
      tracing/lockdep: Fix dependency of TRACE_IRQFLAGS

----
 lib/Kconfig.debug |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---------------------------
commit 46b93b74fc022885ab69dfc8e2af0562dd626638
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date:   Tue Aug 31 16:35:20 2010 -0400

    tracing/lockdep: Fix dependency of TRACE_IRQFLAGS
    
    When CONFIG_IRQSOFF_TRACER is set and CONFIG_PROVE_LOCKING is not, we
    get the following error:
    
    $  make oldconfig
    scripts/kconfig/conf --oldconfig arch/x86/Kconfig
    warning: (IRQSOFF_TRACER && TRACING_SUPPORT && FTRACE && TRACE_IRQFLAGS_SUPPORT && !ARCH_USES_GETTIMEOFFSET) selects TRACE_IRQFLAGS which has unmet direct dependencies (DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && PROVE_LOCKING)
    warning: (IRQSOFF_TRACER && TRACING_SUPPORT && FTRACE && TRACE_IRQFLAGS_SUPPORT && !ARCH_USES_GETTIMEOFFSET) selects TRACE_IRQFLAGS which has unmet direct dependencies (DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && PROVE_LOCKING)
    
    This is because IRQSOFF_TRACER selects TRACE_IRQFLAGS but TRACE_IRQFLAGS
    has PROVE_LOCKING as a dependency. This code is incorrect, and
    this patch changes the TRACE_IRQFLAGS to be just a simple bool that
    does not depend or select anything. Instead both IRQSOFF_TRACER and
    PROVE_LOCKING select it.
    
    Reported-by: Richard Kennedy <richard@xxxxxxxxxxxxxxx>
    Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1b4afd2..e85d549 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -482,6 +482,7 @@ config PROVE_LOCKING
 	select DEBUG_SPINLOCK
 	select DEBUG_MUTEXES
 	select DEBUG_LOCK_ALLOC
+	select TRACE_IRQFLAGS
 	default n
 	help
 	 This feature enables the kernel to prove that all locking
@@ -579,11 +580,10 @@ config DEBUG_LOCKDEP
 	  of more runtime overhead.
 
 config TRACE_IRQFLAGS
-	depends on DEBUG_KERNEL
 	bool
-	default y
-	depends on TRACE_IRQFLAGS_SUPPORT
-	depends on PROVE_LOCKING
+	help
+	  Enables hooks to interrupt enabling and disabling for
+	  either tracing or lock debugging.
 
 config DEBUG_SPINLOCK_SLEEP
 	bool "Spinlock debugging: sleep-inside-spinlock checking"


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