From f159d2de250376916762fd400abe14730b4e30b7 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Fri, 1 Aug 2008 14:10:02 -0700 Subject: [PATCH] --- yaml --- r: 110770 b: refs/heads/master c: ff9cf2ce7afe76435d66c898cc9dacaa68e79d41 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/rcupreempt.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34ef77c89249..1918b5b4ee81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f7b94cd3d564901f9e04a8bc5832ae7bfd690a0 +refs/heads/master: ff9cf2ce7afe76435d66c898cc9dacaa68e79d41 diff --git a/trunk/include/linux/rcupreempt.h b/trunk/include/linux/rcupreempt.h index 0967f03b0705..addb5e282f39 100644 --- a/trunk/include/linux/rcupreempt.h +++ b/trunk/include/linux/rcupreempt.h @@ -111,7 +111,6 @@ extern struct rcupreempt_trace *rcupreempt_trace_cpu(int cpu); struct softirq_action; #ifdef CONFIG_NO_HZ -DECLARE_PER_CPU(struct rcu_dyntick_sched, rcu_dyntick_sched); static inline void rcu_enter_nohz(void) { @@ -126,8 +125,8 @@ static inline void rcu_exit_nohz(void) { static DEFINE_RATELIMIT_STATE(rs, 10 * HZ, 1); - smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */ __get_cpu_var(rcu_dyntick_sched).dynticks++; + smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */ WARN_ON_RATELIMIT(!(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1), &rs); }