O14.1int

@@ -1178,9 +1178,9 @@ skip_queue:
 	 * 3) are cache-hot on their current CPU.
 	 */
 
-#define CAN_MIGRATE_TASK(p,rq,this_cpu)	\
-	((!idle || (NS_TO_JIFFIES(now - (p)->timestamp) > \
-		cache_decay_ticks)) && !task_running(rq, p) && \
+#define CAN_MIGRATE_TASK(p,rq,this_cpu)					\
+	((!idle || (((now - (p)->timestamp)>>10) > cache_decay_ticks)) &&\
+		!task_running(rq, p) &&					\
 			cpu_isset(this_cpu, (p)->cpus_allowed))
 
 	curr = curr->prev;

@@ -1405,6 +1405,7 @@ void scheduler_tick(int user_ticks, int 
 			 */
 			if (HIGH_CREDIT(p))
 				p->activated = 2;
+			p->prio = effective_prio(p);
 			enqueue_task(p, rq->active);
 		}
 	}