1 files changed, 9 insertions, 1 deletions

diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index e9304cdc26fe..a848f526b941 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -246,8 +246,10 @@ static inline void rt_set_overload(struct rq *rq)
          * if we should look at the mask. It would be a shame
          * if we looked at the mask, but the mask was not
          * updated yet.
+         *
+         * Matched by the barrier in pull_rt_task().
          */
-        wmb();
+        smp_wmb();
         atomic_inc(&rq->rd->rto_count);
 }
 
@@ -1626,6 +1628,12 @@ static int pull_rt_task(struct rq *this_rq)
         if (likely(!rt_overloaded(this_rq)))
                 return 0;
 
+        /*
+         * Match the barrier from rt_set_overloaded; this guarantees that if we
+         * see overloaded we must also see the rto_mask bit.
+         */
+        smp_rmb();
+
         for_each_cpu(cpu, this_rq->rd->rto_mask) {
                 if (this_cpu == cpu)
                         continue;