Make PRIOQ &DGLs work. hangs w/ ikglp though

1 files changed, 3 insertions, 3 deletions

diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index 660bfc7f8174..cbc99ee54020 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -11,7 +11,7 @@ struct nested_info
         struct litmus_lock *lock;
         struct task_struct *hp_waiter_eff_prio;
         struct task_struct **hp_waiter_ptr;
-        struct task_struct **owner_ptr;
+//      struct task_struct **owner_ptr;
     struct binheap_node hp_binheap_node;
 };
 
@@ -71,8 +71,7 @@ void select_next_lock(dgl_wait_state_t* dgl_wait /*, struct litmus_lock* prev_lo
 
 void init_dgl_waitqueue_entry(wait_queue_t *wq_node, dgl_wait_state_t* dgl_wait);
 int dgl_wake_up(wait_queue_t *wq_node, unsigned mode, int sync, void *key);
-void __waitqueue_dgl_remove_first(wait_queue_head_t *wq, dgl_wait_state_t** dgl_wait, struct task_struct **task);
-
+struct task_struct* __waitqueue_dgl_remove_first(wait_queue_head_t *wq, dgl_wait_state_t** dgl_wait);
 
 int __attempt_atomic_dgl_acquire(struct litmus_lock *cur_lock, dgl_wait_state_t *dgl_wait);
 #endif
@@ -131,6 +130,7 @@ struct litmus_lock_ops {
         raw_spinlock_t* (*get_dgl_spin_lock)(struct litmus_lock *l);
         int (*dgl_lock)(struct litmus_lock *l, dgl_wait_state_t* dgl_wait, wait_queue_t* wq_node);
         int (*is_owner)(struct litmus_lock *l, struct task_struct *t);
+        struct task_struct* (*get_owner)(struct litmus_lock *l);
         void (*enable_priority)(struct litmus_lock *l, dgl_wait_state_t* dgl_wait);
         
         int (*dgl_can_quick_lock)(struct litmus_lock *l, struct task_struct *t);