From 88e0649467d8717d24a9c921fb57e689b462197d Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@o2.pl>
Date: Wed, 6 Sep 2006 00:03:39 -0700
Subject: [PATCH] --- yaml --- r: 33797 b: refs/heads/master c:
 fc47e7b592dc45b03c27b0a4c8f2d215dae9944d h: refs/heads/master i:   33795:
 d02c860bc9e1386b6ff57089442bf8222ed7a61d v: v3

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

diff --git a/[refs] b/[refs]
index ca37524c5c7a..984161877858 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c336923b668fdcf0312efbec3b44895d713f4d81
+refs/heads/master: fc47e7b592dc45b03c27b0a4c8f2d215dae9944d
diff --git a/trunk/kernel/spinlock.c b/trunk/kernel/spinlock.c
index bfd6ad9c0330..fb524b009eef 100644
--- a/trunk/kernel/spinlock.c
+++ b/trunk/kernel/spinlock.c
@@ -72,7 +72,7 @@ EXPORT_SYMBOL(_write_trylock);
  * not re-enabled during lock-acquire (which the preempt-spin-ops do):
  */
 #if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP) || \
-	defined(CONFIG_PROVE_LOCKING)
+	defined(CONFIG_DEBUG_LOCK_ALLOC)
 
 void __lockfunc _read_lock(rwlock_t *lock)
 {