---

yaml --- r: 252671 b: refs/heads/master c: 0bbcc52 h: refs/heads/master i: 252669: ffebfb5 252667: cdd4b70 252663: 0222666 252655: e206ae2 252639: 95e1154 252607: d231989 252543: 767469c 252415: e5875fe v: v3
git-mirror · May 26, 2011 · 313509f · 313509f
1 parent ff8ce5c
commit 313509f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba9f207c9f82115aba4ce04b22e0081af0ae300f
+refs/heads/master: 0bbcc529fcea9c7de5e2e7243f9913b8f7302a8c
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
@@ -907,6 +907,12 @@ static void rcu_report_qs_rsp(struct rcu_state *rsp, unsigned long flags)
 	unsigned long gp_duration;
 
 	WARN_ON_ONCE(!rcu_gp_in_progress(rsp));
+
+	/*
+	 * Ensure that all grace-period and pre-grace-period activity
+	 * is seen before the assignment to rsp->completed.
+	 */
+	smp_mb(); /* See above block comment. */
 	gp_duration = jiffies - rsp->gp_start;
 	if (gp_duration > rsp->gp_max)
 		rsp->gp_max = gp_duration;