Remove XXX_FROZEN state from rcu/tree. Signed-off-by: Chen, Gong <gong.c...@linux.intel.com> --- kernel/rcu/tree.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 625d0b0..8518338 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -3440,28 +3440,26 @@ static int rcu_cpu_notify(struct notifier_block *self, struct rcu_state *rsp; trace_rcu_utilization(TPS("Start CPU hotplug")); - switch (action) { + switch (action & ~CPU_TASKS_FROZEN) { case CPU_UP_PREPARE: - case CPU_UP_PREPARE_FROZEN: rcu_prepare_cpu(cpu); rcu_prepare_kthreads(cpu); break; case CPU_ONLINE: case CPU_DOWN_FAILED: - rcu_boost_kthread_setaffinity(rnp, -1); + if (!(action & CPU_TASKS_FROZEN)) + rcu_boost_kthread_setaffinity(rnp, -1); break; case CPU_DOWN_PREPARE: - rcu_boost_kthread_setaffinity(rnp, cpu); + if (!(action & CPU_TASKS_FROZEN)) + rcu_boost_kthread_setaffinity(rnp, cpu); break; case CPU_DYING: - case CPU_DYING_FROZEN: for_each_rcu_flavor(rsp) rcu_cleanup_dying_cpu(rsp); break; case CPU_DEAD: - case CPU_DEAD_FROZEN: case CPU_UP_CANCELED: - case CPU_UP_CANCELED_FROZEN: for_each_rcu_flavor(rsp) rcu_cleanup_dead_cpu(cpu, rsp); break; -- 2.0.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/