2 files changed, 23 insertions, 8 deletions

diff --git a/include/litmus/ikglp_lock.h b/include/litmus/ikglp_lock.h
index 357465e78d23..d81b755b9039 100644
--- a/include/litmus/ikglp_lock.h
+++ b/include/litmus/ikglp_lock.h
@@ -19,6 +19,7 @@ typedef struct ikglp_heap_node
 
 struct fifo_queue;
 struct ikglp_wait_state;
+struct fifo_queue;
 
 typedef struct ikglp_donee_heap_node
 {
@@ -29,22 +30,33 @@ typedef struct ikglp_donee_heap_node
         struct binheap_node node;
 } ikglp_donee_heap_node_t;
 
+typedef enum ikglp_states
+{
+        IKGLP_INVL = 0,
+        IKGLP_FQ,
+        IKGLP_PQ,
+        IKGLP_DONOR
+} ikglp_states_t;
+
 // Maintains the state of a request as it goes through the IKGLP
 typedef struct ikglp_wait_state {
-        struct task_struct *task;  // pointer back to the requesting task
+        struct task_struct      *task;  // pointer back to the requesting task
+
+        ikglp_states_t          cur_q;
+        ikglp_heap_node_t       global_heap_node; // data for x-highest-prio tasks
 
         // Data for while waiting in FIFO Queue
-        wait_queue_t fq_node;
-        ikglp_heap_node_t global_heap_node;
-        ikglp_donee_heap_node_t donee_heap_node;
+        wait_queue_t            fq_node;
+        struct fifo_queue       *fq;
+        ikglp_donee_heap_node_t donee_heap_node;
 
         // Data for while waiting in PQ
-        ikglp_heap_node_t pq_node;
+        ikglp_heap_node_t       pq_node;
 
         // Data for while waiting as a donor
-        ikglp_donee_heap_node_t *donee_info;  // cross-linked with donee's ikglp_donee_heap_node_t
-        struct nested_info prio_donation;
-        struct binheap_node node;
+        ikglp_donee_heap_node_t *donee_info;  // cross-linked with donee's ikglp_donee_heap_node_t
+        struct nested_info      prio_donation;
+        struct binheap_node     node;
 } ikglp_wait_state_t;
 
 /* struct for semaphore with priority inheritance */
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index a1cfdb6b6416..7828117a61a8 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -406,7 +406,10 @@ struct rt_param {
 
         /* pointer to lock upon which is currently blocked */
         struct litmus_lock* blocked_lock;
+        unsigned long   blocked_lock_data;
+
         struct litmus_lock* outermost_lock;
+        unsigned int    virtually_unlocked:1;
 #endif
 
         /* user controlled parameters */