1 files changed, 50 insertions, 20 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 47301c04d862..c8ee64569dbb 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -128,6 +128,10 @@ struct control_page {
 #include <litmus/binheap.h>
 #include <linux/semaphore.h>
 
+#ifdef CONFIG_LITMUS_SOFTIRQD
+#include <linux/interrupt.h>
+#endif
+
 struct _rt_domain;
 struct bheap_node;
 struct release_heap;
@@ -205,6 +209,38 @@ typedef struct avg_est{
         lt_t avg;
 } avg_est_t;
 
+
+
+#ifdef CONFIG_LITMUS_SOFTIRQD
+//struct tasklet_head
+//{
+//      struct tasklet_struct *head;
+//      struct tasklet_struct **tail;
+//};
+
+struct klmirqd_info
+{
+        struct task_struct*             klmirqd;
+    struct task_struct*     current_owner;
+    unsigned int                        terminating:1;
+
+        raw_spinlock_t                  lock;
+
+        u32                                             pending;
+        atomic_t                                num_hi_pending;
+        atomic_t                                num_low_pending;
+        atomic_t                                num_work_pending;
+
+        /* in order of priority */
+        struct tasklet_head     pending_tasklets_hi;
+        struct tasklet_head             pending_tasklets;
+        struct list_head                worklist;
+
+        struct list_head                klmirqd_reg;
+};
+#endif
+
+
 /*      RT task parameters for scheduling extensions
  *      These parameters are inherited during clone and therefore must
  *      be explicitly set up before the task set is launched.
@@ -221,34 +257,21 @@ struct rt_param {
 
 #ifdef CONFIG_LITMUS_SOFTIRQD
     /* proxy threads have minimum priority by default */
-    unsigned int        is_proxy_thread:1;
-
-        /* pointer to klmirqd currently working on this
-           task_struct's behalf.  only set by the task pointed
-           to by klmirqd.
+    unsigned int        is_interrupt_thread:1;
 
-           ptr only valid if is_proxy_thread == 0
-         */
-        struct task_struct* cur_klmirqd;
-
-        /* Used to implement mutual execution exclusion between
-         * job and klmirqd execution.  Job must always hold
-         * it's klmirqd_sem to execute.  klmirqd instance
-         * must hold the semaphore before executing on behalf
-         * of a job.
-         */
-        struct mutex                            klmirqd_sem;
-
-        /* status of held klmirqd_sem, even if the held klmirqd_sem is from
-           another task (only proxy threads do this though).
+        /* pointer to data used by klmirqd thread.
+         *
+         * ptr only valid if is_interrupt_thread == 1
          */
-        atomic_t                                        klmirqd_sem_stat;
+        struct klmirqd_info* klmirqd_info;
 #endif
 
 #ifdef CONFIG_LITMUS_NVIDIA
         /* number of top-half interrupts handled on behalf of current job */
         atomic_t                                        nv_int_count;
         long unsigned int                       held_gpus;  // bitmap of held GPUs.
+        struct binheap_node                     gpu_owner_node; // just one GPU for now...
+        unsigned int                            hide_from_gpu:1;
 
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
         avg_est_t gpu_migration_est[MIG_LAST+1];
@@ -370,6 +393,13 @@ struct rt_param {
         struct control_page * ctrl_page;
 };
 
+//#ifdef CONFIG_LITMUS_SOFTIRQD
+//struct klmirqd_data
+//{
+//      struct binheap          klmirqd_users;
+//};
+//#endif
+
 #ifdef CONFIG_REALTIME_AUX_TASKS
 struct aux_data
 {