From 1e3a4a721aa1c03828e1ac078eca3f5ebb59104a Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Fri, 10 Aug 2012 13:55:03 -0700 Subject: [PATCH] --- yaml --- r: 323541 b: refs/heads/master c: 115f7a7ca0d412aab81acaaaa95eb1ab1c622e2f h: refs/heads/master i: 323539: b1aebde1e341eb3bf2577b4d85433e7a4770f108 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree_plugin.h | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f1f159c46c05..ef22805b70e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b065a85354239cc96295f696eeace67ad3a55e5c +refs/heads/master: 115f7a7ca0d412aab81acaaaa95eb1ab1c622e2f diff --git a/trunk/kernel/rcutree_plugin.h b/trunk/kernel/rcutree_plugin.h index c47b28bf18ae..70b33bf780f0 100644 --- a/trunk/kernel/rcutree_plugin.h +++ b/trunk/kernel/rcutree_plugin.h @@ -2200,11 +2200,10 @@ static void zero_cpu_stall_ticks(struct rcu_data *rdp) /* Increment ->ticks_this_gp for all flavors of RCU. */ static void increment_cpu_stall_ticks(void) { - __get_cpu_var(rcu_sched_data).ticks_this_gp++; - __get_cpu_var(rcu_bh_data).ticks_this_gp++; -#ifdef CONFIG_TREE_PREEMPT_RCU - __get_cpu_var(rcu_preempt_data).ticks_this_gp++; -#endif /* #ifdef CONFIG_TREE_PREEMPT_RCU */ + struct rcu_state *rsp; + + for_each_rcu_flavor(rsp) + __this_cpu_ptr(rsp->rda)->ticks_this_gp++; } #else /* #ifdef CONFIG_RCU_CPU_STALL_INFO */