diff --git a/[refs] b/[refs]
index 0cfa52bcfbc3..e3491478ca69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1781538cf5c870ab696e9b8f0a5c498d3900f2f
+refs/heads/master: 077614ee1e93245a3b9a4e1213659405dbeb0ba6
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 7be88a7be047..720df108a2d6 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2041,7 +2041,8 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 	 * We should never call set_task_cpu() on a blocked task,
 	 * ttwu() will sort out the placement.
 	 */
-	WARN_ON_ONCE(p->state != TASK_RUNNING && p->state != TASK_WAKING);
+	WARN_ON_ONCE(p->state != TASK_RUNNING && p->state != TASK_WAKING &&
+			!(task_thread_info(p)->preempt_count & PREEMPT_ACTIVE));
 #endif
 
 	trace_sched_migrate_task(p, new_cpu);