Commit e78ac4b9 authored by Linus Torvalds's avatar Linus Torvalds

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 hotplug fix
parents 29a0c5ce a0490fa3
...@@ -6944,20 +6944,26 @@ static void free_rootdomain(struct root_domain *rd) ...@@ -6944,20 +6944,26 @@ static void free_rootdomain(struct root_domain *rd)
static void rq_attach_root(struct rq *rq, struct root_domain *rd) static void rq_attach_root(struct rq *rq, struct root_domain *rd)
{ {
struct root_domain *old_rd = NULL;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&rq->lock, flags); spin_lock_irqsave(&rq->lock, flags);
if (rq->rd) { if (rq->rd) {
struct root_domain *old_rd = rq->rd; old_rd = rq->rd;
if (cpumask_test_cpu(rq->cpu, old_rd->online)) if (cpumask_test_cpu(rq->cpu, old_rd->online))
set_rq_offline(rq); set_rq_offline(rq);
cpumask_clear_cpu(rq->cpu, old_rd->span); cpumask_clear_cpu(rq->cpu, old_rd->span);
if (atomic_dec_and_test(&old_rd->refcount)) /*
free_rootdomain(old_rd); * If we dont want to free the old_rt yet then
* set old_rd to NULL to skip the freeing later
* in this function:
*/
if (!atomic_dec_and_test(&old_rd->refcount))
old_rd = NULL;
} }
atomic_inc(&rd->refcount); atomic_inc(&rd->refcount);
...@@ -6968,6 +6974,9 @@ static void rq_attach_root(struct rq *rq, struct root_domain *rd) ...@@ -6968,6 +6974,9 @@ static void rq_attach_root(struct rq *rq, struct root_domain *rd)
set_rq_online(rq); set_rq_online(rq);
spin_unlock_irqrestore(&rq->lock, flags); spin_unlock_irqrestore(&rq->lock, flags);
if (old_rd)
free_rootdomain(old_rd);
} }
static int __init_refok init_rootdomain(struct root_domain *rd, bool bootmem) static int __init_refok init_rootdomain(struct root_domain *rd, bool bootmem)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment