diff --git a/[refs] b/[refs]
index 5e368deec69f..0674f859b4cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da84d96176729fb48a8458561e5d8647103168b8
+refs/heads/master: ff56b2f01537aef7237d5ac8bf6bfbb409c1a127
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 089d8b12ab76..945ab1322e18 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2122,11 +2122,16 @@ static void pull_task(struct rq *src_rq, struct task_struct *p,
  * Is this task likely cache-hot:
  */
 static inline int
-task_hot(struct task_struct *p, unsigned long long now, struct sched_domain *sd)
+task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)
 {
-	s64 delta = now - p->se.exec_start;
+	s64 delta;
 
-	return delta < (long long)sysctl_sched_migration_cost;
+	if (p->sched_class != &fair_sched_class)
+		return 0;
+
+	delta = now - p->se.exec_start;
+
+	return delta < (s64)sysctl_sched_migration_cost;
 }
 
 /*