Merge remote branch 'origin/wip-fmlp-dequeue' into wip-k-fmlp

Conflicts:
	include/litmus/litmus.h

1 files changed, 3 insertions, 16 deletions

diff --git a/litmus/locking.c b/litmus/locking.c
index e9e682adc2c9..cfce98e7480d 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -107,27 +107,14 @@ asmlinkage long sys_litmus_unlock(int lock_od)
         return err;
 }
 
-struct task_struct* waitqueue_first(wait_queue_head_t *wq)
+struct task_struct* __waitqueue_remove_first(wait_queue_head_t *wq)
 {
-        wait_queue_t *q;
+        wait_queue_t* q;
+        struct task_struct* t = NULL;
 
         if (waitqueue_active(wq)) {
                 q = list_entry(wq->task_list.next,
                                wait_queue_t, task_list);
-                return (struct task_struct*) q->private;
-        } else
-                return NULL;
-}
-
-struct task_struct* waitqueue_first_and_remove(wait_queue_head_t *wq)
-{
-        wait_queue_t *q;
-        struct task_struct* t = NULL;
-
-        if(waitqueue_active(wq))
-        {
-                q = list_entry(wq->task_list.next,
-                                                wait_queue_t, task_list);
                 t = (struct task_struct*) q->private;
                 __remove_wait_queue(wq, q);
         }