1 files changed, 17 insertions, 7 deletions

diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index 78f035244d21..d17152138c63 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -361,6 +361,7 @@ int get_nv_device_id(struct task_struct* owner)
 
 static int __reg_nv_device(int reg_device_id)
 {
+        int ret = 0;
     struct task_struct* old =
                 cmpxchg(&NV_DEVICE_REG[reg_device_id].device_owner,
                                 NULL,
@@ -370,16 +371,21 @@ static int __reg_nv_device(int reg_device_id)
 
         if(likely(old == NULL))
         {
+#ifdef CONFIG_LITMUS_SOFTIRQD
                 down_and_set_stat(current, HELD, &tsk_rt(current)->klitirqd_sem);
+#endif
                 TRACE_CUR("%s: device %d registered.\n", __FUNCTION__, reg_device_id);
-                return(0);
         }   
         else
         {   
                 TRACE_CUR("%s: device %d is already in use!\n", __FUNCTION__, reg_device_id);
-                return(-EBUSY);    
+                ret = -EBUSY;
         }
-
+        
+        return(ret);
+        
+        
+        
 #if 0
         //unsigned long flags;
         //raw_spin_lock_irqsave(&NV_DEVICE_REG[reg_device_id].lock, flags);
@@ -411,19 +417,22 @@ static int __reg_nv_device(int reg_device_id)
 
 static int __clear_reg_nv_device(int de_reg_device_id)
 {
-        int ret;
-        unsigned long flags;
-    struct task_struct* klitirqd_th = get_klitirqd(de_reg_device_id);
+        int ret = 0;    
         struct task_struct* old;
         
+#ifdef CONFIG_LITMUS_SOFTIRQD
+        unsigned long flags;
+    struct task_struct* klitirqd_th = get_klitirqd(de_reg_device_id);
         lock_nv_registry(de_reg_device_id, &flags);
+#endif
         
         old = cmpxchg(&NV_DEVICE_REG[de_reg_device_id].device_owner,
                                 current,
                                 NULL);
         
         mb();
-                            
+
+#ifdef CONFIG_LITMUS_SOFTIRQD
         if(likely(old == current))
         {   
                 flush_pending(klitirqd_th, current);
@@ -448,6 +457,7 @@ static int __clear_reg_nv_device(int de_reg_device_id)
                         TRACE_CUR("%s: device %d is not registered for this process's use! No one is!\n",
                                           __FUNCTION__, de_reg_device_id);
         }
+#endif
 
         return(ret);
 }