1 files changed, 18 insertions, 19 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index f2c5f180e819..16f532d690cb 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -13,25 +13,22 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
-
-
-#ifdef CONFIG_LITMUS_NESTED_LOCKING
-#include <linux/uaccess.h>
-#endif
+#include <linux/module.h>
 
 #include <litmus/litmus.h>
 #include <litmus/jobs.h>
 #include <litmus/sched_plugin.h>
 #include <litmus/edf_common.h>
 #include <litmus/sched_trace.h>
-#include <litmus/trace.h>
 
 #include <litmus/preempt.h>
 
 #include <litmus/bheap.h>
 #include <litmus/binheap.h>
 
+#ifdef CONFIG_LITMUS_LOCKING
 #include <litmus/kfmlp_lock.h>
+#endif
 
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
 #include <litmus/rsm_lock.h>
@@ -42,12 +39,6 @@
 #include <litmus/affinity.h>
 #endif
 
-#include <linux/module.h>
-
-#ifdef CONFIG_SCHED_CPU_AFFINITY
-#include <litmus/affinity.h>
-#endif
-
 #ifdef CONFIG_LITMUS_SOFTIRQD
 #include <litmus/litmus_softirq.h>
 #endif
@@ -445,17 +436,24 @@ static void gsnedf_tick(struct task_struct* t)
 static void __do_lit_tasklet(struct tasklet_struct* tasklet, unsigned long flushed)
 {
         if (!atomic_read(&tasklet->count)) {
-                sched_trace_tasklet_begin(tasklet->owner);
+                if(tasklet->owner) {
+                        sched_trace_tasklet_begin(tasklet->owner);
+                }
 
                 if (!test_and_clear_bit(TASKLET_STATE_SCHED, &tasklet->state))
                 {
                         BUG();
                 }
-                TRACE("%s: Invoking tasklet with owner pid = %d (flushed = %d).\n", __FUNCTION__, tasklet->owner->pid, flushed);
+                TRACE("%s: Invoking tasklet with owner pid = %d (flushed = %d).\n",
+                          __FUNCTION__,
+                          (tasklet->owner) ? tasklet->owner->pid : -1,
+                          (tasklet->owner) ? 0 : 1);
                 tasklet->func(tasklet->data);
                 tasklet_unlock(tasklet);
 
-                sched_trace_tasklet_end(tasklet->owner, flushed);
+                if(tasklet->owner) {
+                        sched_trace_tasklet_end(tasklet->owner, flushed);
+                }
         }
         else {
                 BUG();
@@ -1130,8 +1128,6 @@ static void __increase_priority_inheritance(struct task_struct* t,
 /* called with IRQs off */
 static void increase_priority_inheritance(struct task_struct* t, struct task_struct* prio_inh)
 {
-        int i = 0;
-
         raw_spin_lock(&gsnedf_lock);
 
         __increase_priority_inheritance(t, prio_inh);
@@ -1150,6 +1146,7 @@ static void increase_priority_inheritance(struct task_struct* t, struct task_str
 
 #if defined(CONFIG_LITMUS_PAI_SOFTIRQD) && defined(CONFIG_LITMUS_NVIDIA)
         if(tsk_rt(t)->held_gpus) {
+                int i;
                 for(i = find_first_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus));
                         i < NV_DEVICE_NUM;
                         i = find_next_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus), i+1)) {
@@ -1217,8 +1214,6 @@ static void __decrease_priority_inheritance(struct task_struct* t,
 static void decrease_priority_inheritance(struct task_struct* t,
                                                                                   struct task_struct* prio_inh)
 {
-        int i;
-
         raw_spin_lock(&gsnedf_lock);
         __decrease_priority_inheritance(t, prio_inh);
 
@@ -1236,6 +1231,7 @@ static void decrease_priority_inheritance(struct task_struct* t,
 
 #if defined(CONFIG_LITMUS_PAI_SOFTIRQD) && defined(CONFIG_LITMUS_NVIDIA)
         if(tsk_rt(t)->held_gpus) {
+                int i;
                 for(i = find_first_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus));
                         i < NV_DEVICE_NUM;
                         i = find_next_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus), i+1)) {
@@ -1723,13 +1719,16 @@ static long gsnedf_allocate_affinity_observer(
                 case KFMLP_SIMPLE_GPU_AFF_OBS:
                         *aff_obs = kfmlp_simple_gpu_aff_obs_new(&gsnedf_kfmlp_affinity_ops, args);
                         break;
+
                 case KFMLP_GPU_AFF_OBS:
                         *aff_obs = kfmlp_gpu_aff_obs_new(&gsnedf_kfmlp_affinity_ops, args);
                         break;
+
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
                 case IKGLP_SIMPLE_GPU_AFF_OBS:
                         *aff_obs = ikglp_simple_gpu_aff_obs_new(&gsnedf_ikglp_affinity_ops, args);
                         break;
+
                 case IKGLP_GPU_AFF_OBS:
                         *aff_obs = ikglp_gpu_aff_obs_new(&gsnedf_ikglp_affinity_ops, args);
                         break;