Update/cleanup lockdep to support nested locks

This patch modifies lockdep to support nested locking
protocols--specifically allow keys allocated in dynamic
memory. We need to allow spinlocks to be acquired in a
nested fashion without triggering complaints from
lockdep. This is needed to support chained/transitive
priority inheritance.

1 files changed, 1 insertions, 8 deletions

diff --git a/litmus/ikglp_lock.c b/litmus/ikglp_lock.c
index bb7771a0f3a2..6f6090591c58 100644
--- a/litmus/ikglp_lock.c
+++ b/litmus/ikglp_lock.c
@@ -1888,15 +1888,8 @@ struct litmus_lock* ikglp_new(unsigned int m,
         sem->litmus_lock.ops = ops;
 //      sem->litmus_lock.proc = &ikglp_proc_ops;
 
-#ifdef CONFIG_DEBUG_SPINLOCK
-        {
-                __raw_spin_lock_init(&sem->lock,
-                                                ((struct litmus_lock*)sem)->cheat_lockdep,
-                                                &((struct litmus_lock*)sem)->key);
-        }
-#else
         raw_spin_lock_init(&sem->lock);
-#endif
+        LOCKDEP_DYNAMIC_ALLOC(sem, &sem->lock);
 
         raw_spin_lock_init(&sem->real_lock);