---

yaml --- r: 87507 b: refs/heads/master c: ae66be9 h: refs/heads/master i: 87505: a78cc94 87503: 4a19563 v: v3
git-mirror · Mar 20, 2008 · 0d83136 · 0d83136
1 parent 72066de
commit 0d83136
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b691da35ba94d5fa0a32589d99b6546be2bf4cfa
+refs/heads/master: ae66be9b71b12f16b84129860d06bbfe37fbec51
diff --git a/trunk/include/linux/rcupreempt.h b/trunk/include/linux/rcupreempt.h
@@ -87,15 +87,15 @@ DECLARE_PER_CPU(long, dynticks_progress_counter);
 
 static inline void rcu_enter_nohz(void)
 {
+	smp_mb(); /* CPUs seeing ++ must see prior RCU read-side crit sects */
 	__get_cpu_var(dynticks_progress_counter)++;
 	WARN_ON(__get_cpu_var(dynticks_progress_counter) & 0x1);
-	mb();
 }
 
 static inline void rcu_exit_nohz(void)
 {
-	mb();
 	__get_cpu_var(dynticks_progress_counter)++;
+	smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */
 	WARN_ON(!(__get_cpu_var(dynticks_progress_counter) & 0x1));
 }