DGLock and DGUnlock implementation.

These methods haven't been fully tested, but they compile and pass a few
simple tests.

4 files changed, 5 insertions, 4 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9c990d13ae35..2b094bdaafa3 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -96,6 +96,7 @@ struct sched_param {
 
 #include <litmus/rt_param.h>
 #include <litmus/preempt.h>
+#include <litmus/fdso.h>
 
 struct exec_domain;
 struct futex_pi_state;
@@ -1538,6 +1539,8 @@ struct task_struct {
         /* references to PI semaphores, etc. */
         struct od_table_entry *od_table;
 
+    resource_mask_t resources;
+
 #ifdef CONFIG_LATENCYTOP
         int latency_record_count;
         struct latency_record latency_record[LT_SAVECOUNT];
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index c9206adb3493..9282f3a8f28f 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -27,6 +27,7 @@ static inline int in_list(struct list_head* list)
 }
 
 struct task_struct* __waitqueue_remove_first(wait_queue_head_t *wq);
+struct task_struct* __waitqueue_peek_first(wait_queue_head_t *wq);
 
 #define NO_CPU                  0xffffffff
 
diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index 8e501c326b8b..968ba6fa828c 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -21,10 +21,6 @@ struct litmus_lock_ops {
         int (*open)(struct litmus_lock*, void* __user);
         int (*close)(struct litmus_lock*);
     
-    /* add or remove a resource from control by the dynamic group lock */
-    int (*add)(struct litmus_lock*, int);
-    int (*remove)(struct litmus_lock*, int);
-
         /* Current tries to lock/unlock this lock (mandatory methods). */
         int (*lock)(struct litmus_lock*);
         int (*unlock)(struct litmus_lock*);
diff --git a/include/litmus/wait.h b/include/litmus/wait.h
index ce1347c355f8..7e20c0a4a1f4 100644
--- a/include/litmus/wait.h
+++ b/include/litmus/wait.h
@@ -2,6 +2,7 @@
 #define _LITMUS_WAIT_H_
 
 struct task_struct* __waitqueue_remove_first(wait_queue_head_t *wq);
+struct task_struct* __waitqueue_peek_first(wait_queue_head_t *wq);
 
 /* wrap regular wait_queue_t head */
 struct __prio_wait_queue {