diff --git a/[refs] b/[refs]
index 0c691f19a458..f436db9a1fce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7b4cddcc5aca03e80e357360c9424dfba5056c2
+refs/heads/master: d2da272a4e581e831e3567a37ef167686f1ea1d3
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index c747bc9f3c24..c4889abc00b6 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -5457,14 +5457,14 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
 		kthread_stop(rq->migration_thread);
 		rq->migration_thread = NULL;
 		/* Idle task back to normal (off runqueue, low prio) */
-		rq = task_rq_lock(rq->idle, &flags);
+		spin_lock_irq(&rq->lock);
 		update_rq_clock(rq);
 		deactivate_task(rq, rq->idle, 0);
 		rq->idle->static_prio = MAX_PRIO;
 		__setscheduler(rq, rq->idle, SCHED_NORMAL, 0);
 		rq->idle->sched_class = &idle_sched_class;
 		migrate_dead_tasks(cpu);
-		task_rq_unlock(rq, &flags);
+		spin_unlock_irq(&rq->lock);
 		migrate_nr_uninterruptible(rq);
 		BUG_ON(rq->nr_running != 0);