1 files changed, 0 insertions, 18 deletions

diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index ae4ad446408b..be0c09b19c6d 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -320,7 +320,6 @@ int init_nvidia_info(void)
 
                 init_nv_device_reg();
                 return(0);
-//              return(-1);
         }
 }
 
@@ -650,7 +649,6 @@ static int gpu_klmirqd_decrease_priority(struct task_struct *klmirqd, struct tas
 long enable_gpu_owner(struct task_struct *t)
 {
         long retval = 0;
-//      unsigned long flags;
         int gpu;
         nv_device_registry_t *reg;
 
@@ -675,8 +673,6 @@ long enable_gpu_owner(struct task_struct *t)
         /* update the registration (and maybe klmirqd) */
         reg = &NV_DEVICE_REG[gpu];
 
-//      raw_spin_lock_irqsave(&reg->lock, flags);
-
         binheap_add(&tsk_rt(t)->gpu_owner_node, &reg->owners,
                                 struct rt_param, gpu_owner_node);
 
@@ -693,8 +689,6 @@ long enable_gpu_owner(struct task_struct *t)
         }
 #endif
 
-//      raw_spin_unlock_irqsave(&reg->lock, flags);
-
 out:
         return retval;
 }
@@ -703,7 +697,6 @@ out:
 long disable_gpu_owner(struct task_struct *t)
 {
         long retval = 0;
-//      unsigned long flags;
         int gpu;
         nv_device_registry_t *reg;
 
@@ -731,9 +724,6 @@ long disable_gpu_owner(struct task_struct *t)
 
         reg = &NV_DEVICE_REG[gpu];
 
-//      raw_spin_lock_irqsave(&reg->lock, flags);
-
-
 #ifdef CONFIG_LITMUS_SOFTIRQD
         hp = container_of(binheap_top_entry(&reg->owners, struct rt_param, gpu_owner_node),
                                           struct task_struct, rt_param);
@@ -761,9 +751,6 @@ long disable_gpu_owner(struct task_struct *t)
         binheap_delete(&tsk_rt(t)->gpu_owner_node, &reg->owners);
 #endif
 
-//      raw_spin_unlock_irqsave(&reg->lock, flags);
-
-
 out:
         return retval;
 }
@@ -792,15 +779,11 @@ int gpu_owner_increase_priority(struct task_struct *t)
         gpu = find_first_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus));
 
         if (!binheap_is_in_heap(&tsk_rt(t)->gpu_owner_node)) {
-                WARN_ON(!is_running(t) && !tsk_rt(t)->hide_from_gpu);
                 TRACE_CUR("nv klmirqd may not inherit from %s/%d on GPU %d\n",
                                   t->comm, t->pid, gpu);
                 goto out;
         }
 
-
-
-
         TRACE_CUR("task %s/%d on GPU %d increasing priority.\n", t->comm, t->pid, gpu);
         reg = &NV_DEVICE_REG[gpu];
 
@@ -842,7 +825,6 @@ int gpu_owner_decrease_priority(struct task_struct *t)
         gpu = find_first_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus));
 
         if (!binheap_is_in_heap(&tsk_rt(t)->gpu_owner_node)) {
-                WARN_ON(!is_running(t) && !tsk_rt(t)->hide_from_gpu);
                 TRACE_CUR("nv klmirqd may not inherit from %s/%d on GPU %d\n",
                                   t->comm, t->pid, gpu);
                 goto out;