Fixed and tested aff-aware KFMLP. (finally!)

1 files changed, 7 insertions, 9 deletions

diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index 80900035881c..287e4a0662d9 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -418,16 +418,15 @@ void pai_check_priority_decrease(struct task_struct *t, int reg_device_id)
 }                  
 #endif
 
-static int __reg_nv_device(int reg_device_id)
+static int __reg_nv_device(int reg_device_id, struct task_struct *t)
 {
         int ret = 0;
         int i;
-        struct task_struct *t = current;
         struct task_struct *old_max = NULL;
         unsigned long flags;
         nv_device_registry_t *reg = &NV_DEVICE_REG[reg_device_id];
 
-    if(__test_bit(reg_device_id, &tsk_rt(t)->held_gpus)) {
+    if(test_bit(reg_device_id, &tsk_rt(t)->held_gpus)) {
                 // TODO: check if taks is already registered.
                 return ret;  // assume already registered.
         }
@@ -471,11 +470,10 @@ static int __reg_nv_device(int reg_device_id)
         return(ret);
 }
 
-static int __clear_reg_nv_device(int de_reg_device_id)
+static int __clear_reg_nv_device(int de_reg_device_id, struct task_struct *t)
 {
         int ret = 0;
         int i;
-        struct task_struct *t = current;
         unsigned long flags;
         nv_device_registry_t *reg = &NV_DEVICE_REG[de_reg_device_id];   
         
@@ -483,7 +481,7 @@ static int __clear_reg_nv_device(int de_reg_device_id)
     struct task_struct* klitirqd_th = get_klitirqd(de_reg_device_id);
 #endif
         
-        WARN_ON(!__test_bit(de_reg_device_id, &tsk_rt(t)->held_gpus));
+        WARN_ON(!test_bit(de_reg_device_id, &tsk_rt(t)->held_gpus));
 
         raw_spin_lock_irqsave(&reg->lock, flags);
         
@@ -518,16 +516,16 @@ static int __clear_reg_nv_device(int de_reg_device_id)
 }
 
 
-int reg_nv_device(int reg_device_id, int reg_action)
+int reg_nv_device(int reg_device_id, int reg_action, struct task_struct *t)
 {
         int ret;
 
         if((reg_device_id < NV_DEVICE_NUM) && (reg_device_id >= 0))
         {
                 if(reg_action)
-                        ret = __reg_nv_device(reg_device_id);
+                        ret = __reg_nv_device(reg_device_id, t);
                 else
-                        ret = __clear_reg_nv_device(reg_device_id);
+                        ret = __clear_reg_nv_device(reg_device_id, t);
         }
         else
         {