From 2c1497f163213f88c284fff767ed3152d08393ab Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paul.mckenney@linaro.org>
Date: Fri, 9 Dec 2011 14:43:47 -0800
Subject: [PATCH] --- yaml --- r: 277253 b: refs/heads/master c:
 4f89b336fd1edf0c88875d0b7fcdc288c7de903d h: refs/heads/master i:   277251:
 a3901d47a2bb48e32825d1861445279639dfa1db v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/rcutiny_plugin.h | 4 ++--
 trunk/kernel/rcutree_plugin.h | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 026e7df35397..621d5d8999ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70321d447aa1a7cc2d60db16234f43c5a65630e7
+refs/heads/master: 4f89b336fd1edf0c88875d0b7fcdc288c7de903d
diff --git a/trunk/kernel/rcutiny_plugin.h b/trunk/kernel/rcutiny_plugin.h
index dfa97cbb3910..9cb1ae4aabdd 100644
--- a/trunk/kernel/rcutiny_plugin.h
+++ b/trunk/kernel/rcutiny_plugin.h
@@ -312,8 +312,8 @@ static int rcu_boost(void)
 	rt_mutex_lock(&mtx);
 	rt_mutex_unlock(&mtx);  /* Keep lockdep happy. */
 
-	return rcu_preempt_ctrlblk.boost_tasks != NULL ||
-	       rcu_preempt_ctrlblk.exp_tasks != NULL;
+	return ACCESS_ONCE(rcu_preempt_ctrlblk.boost_tasks) != NULL ||
+	       ACCESS_ONCE(rcu_preempt_ctrlblk.exp_tasks) != NULL;
 }
 
 /*
diff --git a/trunk/kernel/rcutree_plugin.h b/trunk/kernel/rcutree_plugin.h
index f55f10ba01f5..8bb35d73e1f9 100644
--- a/trunk/kernel/rcutree_plugin.h
+++ b/trunk/kernel/rcutree_plugin.h
@@ -1232,7 +1232,8 @@ static int rcu_boost(struct rcu_node *rnp)
 	rt_mutex_lock(&mtx);  /* Side effect: boosts task t's priority. */
 	rt_mutex_unlock(&mtx);  /* Keep lockdep happy. */
 
-	return rnp->exp_tasks != NULL || rnp->boost_tasks != NULL;
+	return ACCESS_ONCE(rnp->exp_tasks) != NULL ||
+	       ACCESS_ONCE(rnp->boost_tasks) != NULL;
 }
 
 /*