[PATCH] lockdep: better lock debugging

[powerpc.git] / lib / spinlock_debug.c

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index 93c15ee..3de2ccf 100644 (file)
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -8,38 +8,35 @@
 
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/debug_locks.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 
 static void spin_bug(spinlock_t *lock, const char *msg)
 {
-       static long print_once = 1;
        struct task_struct *owner = NULL;
 
-       if (xchg(&print_once, 0)) {
-               if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
-                       owner = lock->owner;
-               printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
-                       msg, raw_smp_processor_id(),
-                       current->comm, current->pid);
-               printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
-                               ".owner_cpu: %d\n",
-                       lock, lock->magic,
-                       owner ? owner->comm : "<none>",
-                       owner ? owner->pid : -1,
-                       lock->owner_cpu);
-               dump_stack();
-#ifdef CONFIG_SMP
-               /*
-                * We cannot continue on SMP:
-                */
-//             panic("bad locking");
-#endif
-       }
+       if (!debug_locks_off())
+               return;
+
+       if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
+               owner = lock->owner;
+       printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
+               msg, raw_smp_processor_id(),
+               current->comm, current->pid);
+       printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
+                       ".owner_cpu: %d\n",
+               lock, lock->magic,
+               owner ? owner->comm : "<none>",
+               owner ? owner->pid : -1,
+               lock->owner_cpu);
+       dump_stack();
 }
 
 #define SPIN_BUG_ON(cond, lock, msg) if (unlikely(cond)) spin_bug(lock, msg)
 
-static inline void debug_spin_lock_before(spinlock_t *lock)
+static inline void
+debug_spin_lock_before(spinlock_t *lock)
 {
        SPIN_BUG_ON(lock->magic != SPINLOCK_MAGIC, lock, "bad magic");
        SPIN_BUG_ON(lock->owner == current, lock, "recursion");
@@ -118,20 +115,13 @@ void _raw_spin_unlock(spinlock_t *lock)
 
 static void rwlock_bug(rwlock_t *lock, const char *msg)
 {
-       static long print_once = 1;
-
-       if (xchg(&print_once, 0)) {
-               printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
-                       msg, raw_smp_processor_id(), current->comm,
-                       current->pid, lock);
-               dump_stack();
-#ifdef CONFIG_SMP
-               /*
-                * We cannot continue on SMP:
-                */
-               panic("bad locking");
-#endif
-       }
+       if (!debug_locks_off())
+               return;
+
+       printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
+               msg, raw_smp_processor_id(), current->comm,
+               current->pid, lock);
+       dump_stack();
 }
 
 #define RWLOCK_BUG_ON(cond, lock, msg) if (unlikely(cond)) rwlock_bug(lock, msg)