From abc0bb051933c1f270ad5021157879dc546e462c Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Wed, 11 Jan 2012 11:34:50 -0800 Subject: [PATCH] --- yaml --- r: 288556 b: refs/heads/master c: f38bd1020f797694b6b5e06f5f06c87688fc84c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 9f39767d6ed2..946e147a121f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a50c3af910e06f35bc0c68f89d8fef98c0fec0ea +refs/heads/master: f38bd1020f797694b6b5e06f5f06c87688fc84c0 diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index 7789e666394d..49bb363a0837 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -984,26 +984,8 @@ rcu_start_gp(struct rcu_state *rsp, unsigned long flags) rsp->fqs_state = RCU_GP_INIT; /* Hold off force_quiescent_state. */ rsp->jiffies_force_qs = jiffies + RCU_JIFFIES_TILL_FORCE_QS; record_gp_stall_check_time(rsp); - - /* Special-case the common single-level case. */ - if (NUM_RCU_NODES == 1) { - rcu_preempt_check_blocked_tasks(rnp); - rnp->qsmask = rnp->qsmaskinit; - rnp->gpnum = rsp->gpnum; - rnp->completed = rsp->completed; - rsp->fqs_state = RCU_SIGNAL_INIT; /* force_quiescent_state OK */ - rcu_start_gp_per_cpu(rsp, rnp, rdp); - rcu_preempt_boost_start_gp(rnp); - trace_rcu_grace_period_init(rsp->name, rnp->gpnum, - rnp->level, rnp->grplo, - rnp->grphi, rnp->qsmask); - raw_spin_unlock_irqrestore(&rnp->lock, flags); - return; - } - raw_spin_unlock(&rnp->lock); /* leave irqs disabled. */ - /* Exclude any concurrent CPU-hotplug operations. */ raw_spin_lock(&rsp->onofflock); /* irqs already disabled. */