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

Commit 051a82fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel:
  keep rd->online and cpu_online_map in sync
  Revert "cpu hotplug: adjust root-domain->online span in response to hotplug event"
parents 6c47d773 08f503b0

kernel/sched.c

+13 −8
Original line number Diff line number Diff line
@@ -5813,13 +5813,6 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) 
		/* Must be high prio: stop_machine expects to yield to it. */

		rq = task_rq_lock(p, &flags);

		__setscheduler(rq, p, SCHED_FIFO, MAX_RT_PRIO-1);



		/* Update our root-domain */

		if (rq->rd) {

			BUG_ON(!cpu_isset(cpu, rq->rd->span));

			cpu_set(cpu, rq->rd->online);

		}



		task_rq_unlock(rq, &flags);

		cpu_rq(cpu)->migration_thread = p;

		break;
@@ -5828,6 +5821,15 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) 
	case CPU_ONLINE_FROZEN:

		/* Strictly unnecessary, as first user will wake it. */

		wake_up_process(cpu_rq(cpu)->migration_thread);



		/* Update our root-domain */

		rq = cpu_rq(cpu);

		spin_lock_irqsave(&rq->lock, flags);

		if (rq->rd) {

			BUG_ON(!cpu_isset(cpu, rq->rd->span));

			cpu_set(cpu, rq->rd->online);

		}

		spin_unlock_irqrestore(&rq->lock, flags);

		break;



#ifdef CONFIG_HOTPLUG_CPU
@@ -5879,7 +5881,8 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) 
		spin_unlock_irq(&rq->lock);

		break;



	case CPU_DOWN_PREPARE:

	case CPU_DYING:

	case CPU_DYING_FROZEN:

		/* Update our root-domain */

		rq = cpu_rq(cpu);

		spin_lock_irqsave(&rq->lock, flags);
@@ -6103,6 +6106,8 @@ static void rq_attach_root(struct rq *rq, struct root_domain *rd) 
	rq->rd = rd;



	cpu_set(rq->cpu, rd->span);

	if (cpu_isset(rq->cpu, cpu_online_map))

		cpu_set(rq->cpu, rd->online);



	for (class = sched_class_highest; class; class = class->next) {

		if (class->join_domain)