locking/arch: Rename set_mb() to smp_store_mb()

Since set_mb() is really about an smp_mb() -- not a IO/DMA barrier
like mb() rename it to match the recent smp_load_acquire() and
smp_store_release().

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 4 insertions, 4 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 2579e407ff67..55ca63ad9622 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2055,7 +2055,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
 {
         /*
          * The task state is guaranteed to be set before another task can
-         * wake it. set_current_state() is implemented using set_mb() and
+         * wake it. set_current_state() is implemented using smp_store_mb() and
          * queue_me() calls spin_unlock() upon completion, both serializing
          * access to the hash list and forcing another memory barrier.
          */
diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h
index 27ab96dca68c..04ab18151cc8 100644
--- a/kernel/locking/qspinlock_paravirt.h
+++ b/kernel/locking/qspinlock_paravirt.h
@@ -175,7 +175,7 @@ static void pv_wait_node(struct mcs_spinlock *node)
                  *
                  * Matches the xchg() from pv_kick_node().
                  */
-                set_mb(pn->state, vcpu_halted);
+                smp_store_mb(pn->state, vcpu_halted);
 
                 if (!READ_ONCE(node->locked))
                         pv_wait(&pn->state, vcpu_halted);
diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c
index 852143a79f36..9bc82329eaad 100644
--- a/kernel/sched/wait.c
+++ b/kernel/sched/wait.c
@@ -341,7 +341,7 @@ long wait_woken(wait_queue_t *wait, unsigned mode, long timeout)
          * condition being true _OR_ WQ_FLAG_WOKEN such that we will not miss
          * an event.
          */
-        set_mb(wait->flags, wait->flags & ~WQ_FLAG_WOKEN); /* B */
+        smp_store_mb(wait->flags, wait->flags & ~WQ_FLAG_WOKEN); /* B */
 
         return timeout;
 }
@@ -354,7 +354,7 @@ int woken_wake_function(wait_queue_t *wait, unsigned mode, int sync, void *key)
          * doesn't imply write barrier and the users expects write
          * barrier semantics on wakeup functions.  The following
          * smp_wmb() is equivalent to smp_wmb() in try_to_wake_up()
-         * and is paired with set_mb() in wait_woken().
+         * and is paired with smp_store_mb() in wait_woken().
          */
         smp_wmb(); /* C */
         wait->flags |= WQ_FLAG_WOKEN;