diff --git a/[refs] b/[refs] index 5a9e6b4c341d..c718ba2cb76c 100644 --- 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 index e486f7c3ffb8..3731141d8ad7 100644 --- 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;