4 files changed, 31 insertions, 8 deletions

diff --git a/include/litmus/edf_common.h b/include/litmus/edf_common.h
index 818f4094b53c..63dff7efe8fb 100644
--- a/include/litmus/edf_common.h
+++ b/include/litmus/edf_common.h
@@ -27,12 +27,6 @@ int edf_min_heap_order(struct binheap_node *a, struct binheap_node *b);
 int edf_max_heap_base_priority_order(struct binheap_node *a, struct binheap_node *b);
 int edf_min_heap_base_priority_order(struct binheap_node *a, struct binheap_node *b);
 
-typedef enum
-{
-        BASE,
-        EFFECTIVE
-} comparison_mode_t;
-
 int __edf_higher_prio(struct task_struct* first, comparison_mode_t first_mode,
                                           struct task_struct* second, comparison_mode_t second_mode);
 
diff --git a/include/litmus/nvidia_info.h b/include/litmus/nvidia_info.h
index 9e07a27fdee3..dd41c4c72b85 100644
--- a/include/litmus/nvidia_info.h
+++ b/include/litmus/nvidia_info.h
@@ -28,11 +28,17 @@ int init_nv_device_reg(void);
 
 int reg_nv_device(int reg_device_id, int register_device);
 
-struct task_struct* get_nv_device_owner(u32 target_device_id);
+struct task_struct* get_nv_max_device_owner(u32 target_device_id);
+//int is_nv_device_owner(u32 target_device_id);
 
 void lock_nv_registry(u32 reg_device_id, unsigned long* flags);
 void unlock_nv_registry(u32 reg_device_id, unsigned long* flags);
 
-void increment_nv_int_count(u32 device);
+#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
+void pai_check_priority_increase(struct task_struct *t, int reg_device_id);
+void pai_check_priority_decrease(struct task_struct *t, int reg_device_id);
+#endif
+
+//void increment_nv_int_count(u32 device);
 
 #endif
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index d0040bfd2d0c..b4eb8ee95687 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -154,6 +154,7 @@ struct rt_param {
 #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.
 #endif
 
 #ifdef CONFIG_LITMUS_LOCKING
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index e31008fcdd59..8e65555d9b7f 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -74,10 +74,28 @@ typedef void (*decrease_prio_klitirqd_t)(struct task_struct* klitirqd,
 
 
 typedef int (*enqueue_pai_tasklet_t)(struct tasklet_struct* tasklet);
+typedef void (*change_prio_pai_tasklet_t)(struct task_struct *old_prio,
+                                                                                  struct task_struct *new_prio);
 typedef void (*run_tasklets_t)(struct task_struct* next);
 
 typedef raw_spinlock_t* (*get_dgl_spinlock_t) (struct task_struct *t);
 
+
+typedef int (*higher_prio_t)(struct task_struct* a, struct task_struct* b);
+
+#ifdef CONFIG_LITMUS_NESTED_LOCKING
+
+typedef enum
+{
+        BASE,
+        EFFECTIVE
+} comparison_mode_t;
+
+typedef int (*__higher_prio_t)(struct task_struct* a, comparison_mode_t a_mod,
+                                                          struct task_struct* b, comparison_mode_t b_mod);
+#endif
+
+
 /********************* sys call backends  ********************/
 /* This function causes the caller to sleep until the next release */
 typedef long (*complete_job_t) (void);
@@ -112,6 +130,8 @@ struct sched_plugin {
         task_block_t            task_block;
         task_exit_t             task_exit;
 
+        higher_prio_t           compare;
+        
 #ifdef CONFIG_LITMUS_LOCKING
         /*      locking protocols       */
         allocate_lock_t         allocate_lock;
@@ -121,6 +141,7 @@ struct sched_plugin {
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
         nested_increase_prio_t nested_increase_prio;
         nested_decrease_prio_t nested_decrease_prio;
+        __higher_prio_t         __compare;
 #endif
 #ifdef CONFIG_LITMUS_DGL_SUPPORT
         get_dgl_spinlock_t      get_dgl_spinlock;
@@ -132,6 +153,7 @@ struct sched_plugin {
 #endif
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
         enqueue_pai_tasklet_t           enqueue_pai_tasklet;
+        change_prio_pai_tasklet_t       change_prio_pai_tasklet;
         run_tasklets_t                          run_tasklets;
 #endif
 } __attribute__ ((__aligned__(SMP_CACHE_BYTES)));