From 6e5a9cc4659c72b107267e658860158765ea35bb Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 5 Aug 2006 12:13:47 -0700
Subject: [PATCH] --- yaml --- r: 33223 b: refs/heads/master c:
 72f0b4e2133ba1d65147d06016c0b6d2202235ca h: refs/heads/master i:   33221:
 42311bfbd0d9a04438775ce7f24944e3023f9c08   33219:
 15b6b1f889c372dbff4eca44f174bfdd4e35cf9e   33215:
 d8ddba9662e6bf823e752339b74964edd92c5668 v: v3

---
 [refs]                     |  2 +-
 trunk/lib/spinlock_debug.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5266a3960055..b18d33362acf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 927cbe8a3e9ebc466f76af5a5278a520dc2d5699
+refs/heads/master: 72f0b4e2133ba1d65147d06016c0b6d2202235ca
diff --git a/trunk/lib/spinlock_debug.c b/trunk/lib/spinlock_debug.c
index 3d9c4dc965ed..58c577dd82e5 100644
--- a/trunk/lib/spinlock_debug.c
+++ b/trunk/lib/spinlock_debug.c
@@ -162,6 +162,7 @@ static void rwlock_bug(rwlock_t *lock, const char *msg)
 
 #define RWLOCK_BUG_ON(cond, lock, msg) if (unlikely(cond)) rwlock_bug(lock, msg)
 
+#if 0		/* __write_lock_debug() can lock up - maybe this can too? */
 static void __read_lock_debug(rwlock_t *lock)
 {
 	int print_once = 1;
@@ -184,12 +185,12 @@ static void __read_lock_debug(rwlock_t *lock)
 		}
 	}
 }
+#endif
 
 void _raw_read_lock(rwlock_t *lock)
 {
 	RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
-	if (unlikely(!__raw_read_trylock(&lock->raw_lock)))
-		__read_lock_debug(lock);
+	__raw_read_lock(&lock->raw_lock);
 }
 
 int _raw_read_trylock(rwlock_t *lock)
@@ -235,6 +236,7 @@ static inline void debug_write_unlock(rwlock_t *lock)
 	lock->owner_cpu = -1;
 }
 
+#if 0		/* This can cause lockups */
 static void __write_lock_debug(rwlock_t *lock)
 {
 	int print_once = 1;
@@ -257,12 +259,12 @@ static void __write_lock_debug(rwlock_t *lock)
 		}
 	}
 }
+#endif
 
 void _raw_write_lock(rwlock_t *lock)
 {
 	debug_write_lock_before(lock);
-	if (unlikely(!__raw_write_trylock(&lock->raw_lock)))
-		__write_lock_debug(lock);
+	__raw_write_lock(&lock->raw_lock);
 	debug_write_lock_after(lock);
 }