From 24dae12dccc3b04ee3c0f4ae0fbaaf037bd3e27f Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Sat, 15 Aug 2009 09:53:49 -0700 Subject: [PATCH] --- yaml --- r: 158151 b: refs/heads/master c: 8064d54929f23613e649dc7e14f7a94454487d58 h: refs/heads/master i: 158149: 9986e31c480a94952b2e0175cce707455c918ab1 158147: a6f2dba367be62cb6c456fe149672037b0d03f5b 158143: 9c145e6af7478dce011b15f03178175f44a8f3d1 v: v3 --- [refs] | 2 +- trunk/kernel/rcupreempt.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b16b71f797de..865a1ee3e60a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e597558086dec36d5c33521a36e0f6b1bc3f3a7 +refs/heads/master: 8064d54929f23613e649dc7e14f7a94454487d58 diff --git a/trunk/kernel/rcupreempt.c b/trunk/kernel/rcupreempt.c index 9b87f5134ed7..2748b89910b6 100644 --- a/trunk/kernel/rcupreempt.c +++ b/trunk/kernel/rcupreempt.c @@ -849,7 +849,7 @@ rcu_try_flip_waitzero(void) /* Check to see if the sum of the "last" counters is zero. */ RCU_TRACE_ME(rcupreempt_trace_try_flip_z1); - for_each_cpu(cpu, to_cpumask(rcu_cpu_online_map)) + for_each_possible_cpu(cpu) sum += RCU_DATA_CPU(cpu)->rcu_flipctr[lastidx]; if (sum != 0) { RCU_TRACE_ME(rcupreempt_trace_try_flip_ze1); @@ -1067,12 +1067,6 @@ void rcu_offline_cpu(int cpu) /* seen -after- acknowledgement. */ } - RCU_DATA_ME()->rcu_flipctr[0] += RCU_DATA_CPU(cpu)->rcu_flipctr[0]; - RCU_DATA_ME()->rcu_flipctr[1] += RCU_DATA_CPU(cpu)->rcu_flipctr[1]; - - RCU_DATA_CPU(cpu)->rcu_flipctr[0] = 0; - RCU_DATA_CPU(cpu)->rcu_flipctr[1] = 0; - cpumask_clear_cpu(cpu, to_cpumask(rcu_cpu_online_map)); spin_unlock_irqrestore(&rcu_ctrlblk.fliplock, flags);