X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fspinlock_debug.c;fp=lib%2Fspinlock_debug.c;h=8ebd8ea08935cd2728d5b6c5e453fb22200f0ffa;hb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;hp=34022dd9aaaebce5e37dd8abc19279488158df9c;hpb=1db395853d4f30d6120458bd279ede1f882a8525;p=linux-2.6.git

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index 34022dd9a..8ebd8ea08 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -150,6 +150,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;
@@ -171,12 +172,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)
@@ -222,6 +223,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;
@@ -243,12 +245,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);
 }