2 files changed, 17 insertions, 1 deletions

diff --git a/include/litmus/gpu_affinity.h b/include/litmus/gpu_affinity.h
index d64a15cbf2a5..47da725717b0 100644
--- a/include/litmus/gpu_affinity.h
+++ b/include/litmus/gpu_affinity.h
@@ -31,6 +31,21 @@ static inline lt_t get_gpu_time(struct task_struct* t)
 
 static inline lt_t get_gpu_estimate(struct task_struct* t, gpu_migration_dist_t dist)
 {
+        int i;
+        lt_t val;
+
+        if(dist == MIG_NONE) {
+                dist = MIG_LOCAL;
+        }
+
+        val = t->rt_param.gpu_migration_est[dist].avg;
+        for(i = dist-1; i >= 0; --i) {
+                if(t->rt_param.gpu_migration_est[i].avg > val) {
+                        val = t->rt_param.gpu_migration_est[i].avg;
+                }
+        }
+
+#if 0
 //      int i;
 //      fpbuf_t temp = _fp_to_integer(t->rt_param.gpu_migration_est[dist].est);
 //      lt_t val = (temp >= 0) ? temp : 0;  // never allow negative estimates...
@@ -43,6 +58,7 @@ static inline lt_t get_gpu_estimate(struct task_struct* t, gpu_migration_dist_t
 //      for(i = dist-1; (val == 0) && (i >= MIG_LOCAL); --i) {
 //              val = _fp_to_integer(t->rt_param.gpu_migration_est[i].est);
 //      }
+#endif
 
         return ((val > 0) ? val : dist+1);
 }
diff --git a/include/litmus/ikglp_lock.h b/include/litmus/ikglp_lock.h
index 9d0cd3d1904e..89d9c37c7631 100644
--- a/include/litmus/ikglp_lock.h
+++ b/include/litmus/ikglp_lock.h
@@ -139,7 +139,7 @@ struct ikglp_affinity
         struct ikglp_affinity_ops *ops;
         struct ikglp_queue_info *q_info;
         int *nr_cur_users_on_rsrc;
-        int *nr_aff_on_rsrc;
+        int64_t *nr_aff_on_rsrc;
         int offset;
         int nr_simult;
         int nr_rsrc;