diff options
author | Gregory Haskins <ghaskins@novell.com> | 2008-03-10 16:52:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-03-11 09:02:58 -0400 |
commit | 1f94ef598e8d29b92b9fc85d43c832e03721d3cb (patch) | |
tree | f9573663c4bb83a9af4d17b90c174869b50ba2b1 /kernel | |
parent | 2f44bbb495dd3e6d0209eff2257438ab9c570e5b (diff) |
Revert "cpu hotplug: adjust root-domain->online span in response to hotplug event"
This reverts commit 393d94d98b19089ec172566e23557997931b137e.
Lets fix this right.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
Cc: Gautham R Shenoy <ego@in.ibm.com>
Cc: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index b02e4fc25645..52b98675acb2 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -5813,13 +5813,6 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
5813 | /* Must be high prio: stop_machine expects to yield to it. */ | 5813 | /* Must be high prio: stop_machine expects to yield to it. */ |
5814 | rq = task_rq_lock(p, &flags); | 5814 | rq = task_rq_lock(p, &flags); |
5815 | __setscheduler(rq, p, SCHED_FIFO, MAX_RT_PRIO-1); | 5815 | __setscheduler(rq, p, SCHED_FIFO, MAX_RT_PRIO-1); |
5816 | |||
5817 | /* Update our root-domain */ | ||
5818 | if (rq->rd) { | ||
5819 | BUG_ON(!cpu_isset(cpu, rq->rd->span)); | ||
5820 | cpu_set(cpu, rq->rd->online); | ||
5821 | } | ||
5822 | |||
5823 | task_rq_unlock(rq, &flags); | 5816 | task_rq_unlock(rq, &flags); |
5824 | cpu_rq(cpu)->migration_thread = p; | 5817 | cpu_rq(cpu)->migration_thread = p; |
5825 | break; | 5818 | break; |
@@ -5828,6 +5821,15 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
5828 | case CPU_ONLINE_FROZEN: | 5821 | case CPU_ONLINE_FROZEN: |
5829 | /* Strictly unnecessary, as first user will wake it. */ | 5822 | /* Strictly unnecessary, as first user will wake it. */ |
5830 | wake_up_process(cpu_rq(cpu)->migration_thread); | 5823 | wake_up_process(cpu_rq(cpu)->migration_thread); |
5824 | |||
5825 | /* Update our root-domain */ | ||
5826 | rq = cpu_rq(cpu); | ||
5827 | spin_lock_irqsave(&rq->lock, flags); | ||
5828 | if (rq->rd) { | ||
5829 | BUG_ON(!cpu_isset(cpu, rq->rd->span)); | ||
5830 | cpu_set(cpu, rq->rd->online); | ||
5831 | } | ||
5832 | spin_unlock_irqrestore(&rq->lock, flags); | ||
5831 | break; | 5833 | break; |
5832 | 5834 | ||
5833 | #ifdef CONFIG_HOTPLUG_CPU | 5835 | #ifdef CONFIG_HOTPLUG_CPU |
@@ -6103,6 +6105,8 @@ static void rq_attach_root(struct rq *rq, struct root_domain *rd) | |||
6103 | rq->rd = rd; | 6105 | rq->rd = rd; |
6104 | 6106 | ||
6105 | cpu_set(rq->cpu, rd->span); | 6107 | cpu_set(rq->cpu, rd->span); |
6108 | if (cpu_isset(rq->cpu, cpu_online_map)) | ||
6109 | cpu_set(rq->cpu, rd->online); | ||
6106 | 6110 | ||
6107 | for (class = sched_class_highest; class; class = class->next) { | 6111 | for (class = sched_class_highest; class; class = class->next) { |
6108 | if (class->join_domain) | 6112 | if (class->join_domain) |