1 files changed, 13 insertions, 7 deletions

diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index a01890153fa1..57d2abfe2a12 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -13,13 +13,19 @@ struct litmus_lock {
         int type;
     
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
-    struct list_head lock_chain;
-#endif
-};
+        struct task_struct *hp_waiter_eff_prio;
+        struct task_struct **hp_waiter_ptr;
+    struct binheap_node hp_binheap_node;
+        
+        int ident;
+
+//#ifdef CONFIG_DEBUG_SPINLOCK  
+        char cheat_lockdep[2];
+        struct lock_class_key key;
+//#endif
 
-#ifdef CONFIG_LITMUS_NESTED_LOCKING
-void nest_lock(struct litmus_lock *l, struct task_struct *t);
 #endif
+};
 
 struct litmus_lock_ops {
         /* Current task tries to obtain / drop a reference to a lock.
@@ -35,8 +41,8 @@ struct litmus_lock_ops {
         void (*deallocate)(struct litmus_lock*);
         
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
-        void (*propagate_increase_inheritance)(struct litmus_lock* l, struct task_struct* t);
-        void (*propagate_decrease_inheritance)(struct litmus_lock* l, struct task_struct* t);
+        void (*propagate_increase_inheritance)(struct litmus_lock* l, struct task_struct* t, raw_spinlock_t* to_unlock, unsigned long irqflags);
+        void (*propagate_decrease_inheritance)(struct litmus_lock* l, struct task_struct* t, raw_spinlock_t* to_unlock, unsigned long irqflags);
 #endif
 };