lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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"
This commit is contained in:
Linus Torvalds
2008-03-11 09:18:56 -07:00
parent 6c47d773e7 08f503b0c0
commit 051a82fc0c
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/sched.c
View File

@@ -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. */ /* Must be high prio: stop_machine expects to yield to it. */
rq = task_rq_lock(p, &flags); rq = task_rq_lock(p, &flags);
__setscheduler(rq, p, SCHED_FIFO, MAX_RT_PRIO-1); __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); task_rq_unlock(rq, &flags);
cpu_rq(cpu)->migration_thread = p; cpu_rq(cpu)->migration_thread = p;
break; break;
@@ -5828,6 +5821,15 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
case CPU_ONLINE_FROZEN: case CPU_ONLINE_FROZEN:
/* Strictly unnecessary, as first user will wake it. */ /* Strictly unnecessary, as first user will wake it. */
wake_up_process(cpu_rq(cpu)->migration_thread); 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; break;
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
@@ -5879,7 +5881,8 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
spin_unlock_irq(&rq->lock); spin_unlock_irq(&rq->lock);
break; break;
case CPU_DOWN_PREPARE: case CPU_DYING:
case CPU_DYING_FROZEN:
/* Update our root-domain */ /* Update our root-domain */
rq = cpu_rq(cpu); rq = cpu_rq(cpu);
spin_lock_irqsave(&rq->lock, flags); 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; rq->rd = rd;
cpu_set(rq->cpu, rd->span); 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) { for (class = sched_class_highest; class; class = class->next) {
if (class->join_domain) if (class->join_domain)