minor fixes

2 files changed, 25 insertions, 9 deletions

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 4b55daafbbea..3ad0e7d9e782 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -411,23 +411,32 @@ static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
 static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
 
 #ifdef CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS
-static int __do_nv_now(struct tasklet_struct* tasklet)
+static int __do_nv_now(struct tasklet_struct* t)
 {
         int success = 1;
 
-        if(tasklet_trylock(tasklet)) {
-                if (!atomic_read(&tasklet->count)) {
-                        if (!test_and_clear_bit(TASKLET_STATE_SCHED, &tasklet->state)) {    
+/*
+#ifdef CONFIG_SCHED_DEBUG_TRACE
+        u32 nvidia_device = get_tasklet_nv_device_num(t);
+        TRACE("Handling NVIDIA tasklet for device %u at %llu\n",
+                nvidia_device, litmus_clock());
+#endif
+*/
+        TRACE("Handling NVIDIA tasklet.\n");
+
+        if(tasklet_trylock(t)) {
+                if (!atomic_read(&t->count)) {
+                        if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state)) {
                                 BUG();
                         }
-                        tasklet->func(tasklet->data);
-                        tasklet_unlock(tasklet);
+                        t->func(t->data);
+                        tasklet_unlock(t);
                 }
                 else {
                         success = 0;
                 }
 
-                tasklet_unlock(tasklet);
+                tasklet_unlock(t);
         }
         else {
                 success = 0;
@@ -451,8 +460,8 @@ static int __klmirqd_nv_tasklet_schedule(struct tasklet_struct *t,
 
         BUG_ON(!klmirqd_func);
 
-        TRACE("%s: Handling NVIDIA tasklet for device %u (klmirqd: %s/%d) at %llu\n",
-                __FUNCTION__, nvidia_device,
+        TRACE("Handling NVIDIA tasklet for device %u (klmirqd: %s/%d) at %llu\n",
+                nvidia_device,
                 (klmirqd_th) ? klmirqd_th->comm : "nil",
                 (klmirqd_th) ? klmirqd_th->pid : 0,
                 litmus_clock());
@@ -476,6 +485,8 @@ void __tasklet_schedule(struct tasklet_struct *t)
                 /* do nvidia tasklets right away and return */
                 if(__do_nv_now(t))
                         return;
+                else
+                        goto default_linux_handling;
 #elif defined(CONFIG_LITMUS_SOFTIRQD)
                 if(__klmirqd_nv_tasklet_schedule(t, _litmus_tasklet_schedule))
                         return;
@@ -516,6 +527,8 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
                 /* do nvidia tasklets right away and return */
                 if(__do_nv_now(t))
                         return;
+                else
+                        goto default_linux_handling;
 #elif defined(CONFIG_LITMUS_SOFTIRQD)
                 if(__klmirqd_nv_tasklet_schedule(t, _litmus_tasklet_hi_schedule))
                         return;
diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index 73c933a87623..7160bb85ac9d 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -49,6 +49,9 @@ typedef struct
     void  *priv;                    /* private data */
     void  *os_state;                /* os-specific device state */
 
+#ifdef CONFIG_CUDA_4_0
+        int        rmInitialized; /* TODO: appears in CUDA 3_2? */
+#endif
     int    flags;
 
     /* PCI config info */