From bc0dd6b3c8ace3e9ffd43e9f61041fda6502a54c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 14 Jul 2008 10:28:38 +0200
Subject: [PATCH] --- yaml --- r: 100665 b: refs/heads/master c:
 992860e991f2015fb8c8df65aa32afa0dcbb4430 h: refs/heads/master i:   100663:
 a00332a4bf225c2196818fa93bce1d272fae2fab v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/lockdep.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 438bf4e8a516..71081e6ab059 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4ba0ba24b57ec975482f4ba2d350fbee7557240
+refs/heads/master: 992860e991f2015fb8c8df65aa32afa0dcbb4430
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index 7553a28b99cd..fc5d5aabd77a 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -2688,7 +2688,8 @@ __lock_release(struct lockdep_map *lock, int nested, unsigned long ip)
  */
 static void check_flags(unsigned long flags)
 {
-#if defined(CONFIG_DEBUG_LOCKDEP) && defined(CONFIG_TRACE_IRQFLAGS)
+#if defined(CONFIG_PROVE_LOCKING) && defined(CONFIG_DEBUG_LOCKDEP) && \
+    defined(CONFIG_TRACE_IRQFLAGS)
 	if (!debug_locks)
 		return;