enable migration tracing and short-cut interrupts

2 files changed, 7 insertions, 7 deletions

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 5ce271675662..b013046e8c36 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -445,7 +445,7 @@ void __tasklet_schedule(struct tasklet_struct *t)
 #ifdef CONFIG_LITMUS_NVIDIA
         if(is_nvidia_func(t->func))
         {
-#if 0
+#if 1
                 // do nvidia tasklets right away and return
                 if(__do_nv_now(t))
                         return;
diff --git a/litmus/gpu_affinity.c b/litmus/gpu_affinity.c
index 9762be1a085e..55bb5e1128ec 100644
--- a/litmus/gpu_affinity.c
+++ b/litmus/gpu_affinity.c
@@ -58,17 +58,17 @@ void update_gpu_estimate(struct task_struct *t, lt_t observed)
                         fb->accum_err = _div(fb->est, _integer_to_fp(2));  // ...seems to work.
                 }
                 else {
-//                      struct migration_info mig_info;
+                        struct migration_info mig_info;
 
                         sched_trace_prediction_err(t,
                                                                            &(tsk_rt(t)->gpu_migration),
                                                                            &rel_err);
 
-//                      mig_info.observed = observed;
-//                      mig_info.estimated = get_gpu_estimate(t, tsk_rt(t)->gpu_migration);
-//                      mig_info.distance = tsk_rt(t)->gpu_migration;
-//
-//                      sched_trace_migration(t, &mig_info);
+                        mig_info.observed = observed;
+                        mig_info.estimated = get_gpu_estimate(t, tsk_rt(t)->gpu_migration);
+                        mig_info.distance = tsk_rt(t)->gpu_migration;
+
+                        sched_trace_migration(t, &mig_info);
                 }
         }