The patch titled
cpu hotplug: adjust root-domain->online span in response to hotplug event
has been removed from the -mm tree. Its filename was
cpu-hotplug-adjust-root-domain-online-span-in-response-to-hotplug-event.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cpu hotplug: adjust root-domain->online span in response to hotplug event
From: Gregory Haskins <ghaskins@xxxxxxxxxx>
We currently set the root-domain online span automatically when the domain is
added to the cpu if the cpu is already a member of cpu_online_map. This was
done as a hack/bug-fix for s2ram, but it also causes a problem with hotplug
CPU_DOWN transitioning. The right way to fix the original problem is to
actually respond to CPU_UP events, instead of CPU_ONLINE, which is already too
late.
Signed-off-by: Gregory Haskins <ghaskins@xxxxxxxxxx>
Cc: "Siddha, Suresh B" <suresh.b.siddha@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/sched.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff -puN kernel/sched.c~cpu-hotplug-adjust-root-domain-online-span-in-response-to-hotplug-event kernel/sched.c
--- a/kernel/sched.c~cpu-hotplug-adjust-root-domain-online-span-in-response-to-hotplug-event
+++ a/kernel/sched.c
@@ -5890,6 +5890,13 @@ migration_call(struct notifier_block *nf
/* 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;
@@ -5898,15 +5905,6 @@ migration_call(struct notifier_block *nf
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
@@ -6182,8 +6180,6 @@ static void rq_attach_root(struct rq *rq
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)
_
Patches currently in -mm which might be from ghaskins@xxxxxxxxxx are
git-kvm.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
