5 files changed, 13 insertions, 16 deletions

diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
index be9ee1559fca..9887a905a762 100644
--- a/kernel/locking/mcs_spinlock.c
+++ b/kernel/locking/mcs_spinlock.c
@@ -1,6 +1,4 @@
-
 #include <linux/percpu.h>
-#include <linux/mutex.h>
 #include <linux/sched.h>
 #include "mcs_spinlock.h"
 
@@ -79,7 +77,7 @@ osq_wait_next(struct optimistic_spin_queue *lock,
                                 break;
                 }
 
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
         }
 
         return next;
@@ -120,7 +118,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
                 if (need_resched())
                         goto unqueue;
 
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
         }
         return true;
 
@@ -146,7 +144,7 @@ unqueue:
                 if (smp_load_acquire(&node->locked))
                         return true;
 
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
 
                 /*
                  * Or we race against a concurrent unqueue()'s step-B, in which
diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
index 74356dc0ce29..23e89c5930e9 100644
--- a/kernel/locking/mcs_spinlock.h
+++ b/kernel/locking/mcs_spinlock.h
@@ -27,7 +27,7 @@ struct mcs_spinlock {
 #define arch_mcs_spin_lock_contended(l)                                 \
 do {                                                                    \
         while (!(smp_load_acquire(l)))                                  \
-                arch_mutex_cpu_relax();                                 \
+                cpu_relax_lowlatency();                                 \
 } while (0)
 #endif
 
@@ -104,7 +104,7 @@ void mcs_spin_unlock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
                         return;
                 /* Wait until the next pointer is set */
                 while (!(next = ACCESS_ONCE(node->next)))
-                        arch_mutex_cpu_relax();
+                        cpu_relax_lowlatency();
         }
 
         /* Pass lock to next waiter. */
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index d3100521388c..ae712b25e492 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -146,7 +146,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner)
                 if (need_resched())
                         break;
 
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
         }
         rcu_read_unlock();
 
@@ -464,7 +464,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
                  * memory barriers as we'll eventually observe the right
                  * values at the cost of a few extra spins.
                  */
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
         }
         osq_unlock(&lock->osq);
 slowpath:
diff --git a/kernel/locking/qrwlock.c b/kernel/locking/qrwlock.c
index fb5b8ac411a5..f956ede7f90d 100644
--- a/kernel/locking/qrwlock.c
+++ b/kernel/locking/qrwlock.c
@@ -20,7 +20,6 @@
 #include <linux/cpumask.h>
 #include <linux/percpu.h>
 #include <linux/hardirq.h>
-#include <linux/mutex.h>
 #include <asm/qrwlock.h>
 
 /**
@@ -35,7 +34,7 @@ static __always_inline void
 rspin_until_writer_unlock(struct qrwlock *lock, u32 cnts)
 {
         while ((cnts & _QW_WMASK) == _QW_LOCKED) {
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
                 cnts = smp_load_acquire((u32 *)&lock->cnts);
         }
 }
@@ -75,7 +74,7 @@ void queue_read_lock_slowpath(struct qrwlock *lock)
          * to make sure that the write lock isn't taken.
          */
         while (atomic_read(&lock->cnts) & _QW_WMASK)
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
 
         cnts = atomic_add_return(_QR_BIAS, &lock->cnts) - _QR_BIAS;
         rspin_until_writer_unlock(lock, cnts);
@@ -114,7 +113,7 @@ void queue_write_lock_slowpath(struct qrwlock *lock)
                                     cnts | _QW_WAITING) == cnts))
                         break;
 
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
         }
 
         /* When no more readers, set the locked flag */
@@ -125,7 +124,7 @@ void queue_write_lock_slowpath(struct qrwlock *lock)
                                     _QW_LOCKED) == _QW_WAITING))
                         break;
 
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
         }
 unlock:
         arch_spin_unlock(&lock->lock);
diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c
index a2391ac135c8..d6203faf2eb1 100644
--- a/kernel/locking/rwsem-xadd.c
+++ b/kernel/locking/rwsem-xadd.c
@@ -329,7 +329,7 @@ bool rwsem_spin_on_owner(struct rw_semaphore *sem, struct task_struct *owner)
                 if (need_resched())
                         break;
 
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
         }
         rcu_read_unlock();
 
@@ -381,7 +381,7 @@ static bool rwsem_optimistic_spin(struct rw_semaphore *sem)
                  * memory barriers as we'll eventually observe the right
                  * values at the cost of a few extra spins.
                  */
-                arch_mutex_cpu_relax();
+                cpu_relax_lowlatency();
         }
         osq_unlock(&sem->osq);
 done: