diff --git a/[refs] b/[refs] index b6d3d323ccde..9faa28364eb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3e947867478af9a12b9956bcd000ac7613a8a95 +refs/heads/master: 08bedae1d0acd8c9baf514fb69fa199d0c8345f6 diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c index 8b51b2d9b1fd..ba144b121f3d 100644 --- a/trunk/kernel/sched/core.c +++ b/trunk/kernel/sched/core.c @@ -5048,7 +5048,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) migrate_tasks(cpu); BUG_ON(rq->nr_running != 1); /* the migration thread */ raw_spin_unlock_irqrestore(&rq->lock, flags); + break; + case CPU_DEAD: calc_load_migrate(rq); break; #endif