Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9fc05e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: CPU remove deadlock fix
parents b88ed205 9a2bd244

kernel/sched.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -6587,7 +6587,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) 
			req = list_entry(rq->migration_queue.next,

			req = list_entry(rq->migration_queue.next,

					 struct migration_req, list);

					 struct migration_req, list);

			list_del_init(&req->list);

			list_del_init(&req->list);

			spin_unlock_irq(&rq->lock);

			complete(&req->done);

			complete(&req->done);

			spin_lock_irq(&rq->lock);

		}

		}

		spin_unlock_irq(&rq->lock);

		spin_unlock_irq(&rq->lock);

		break;

		break;