From 0228ea4e0b1f424fb8b75704284cfb1c6ecb8f27 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 22 May 2002 13:19:22 +0000
Subject: [PATCH] Rename cpu_pause() to pause().  Originally I was going to
 make this an MI API with empty cpu_pause() functions on other arch's, but
 this functionality is definitely unique to IA-32, so I decided to leave it as
 i386-only and wrap it in #ifdef's.  I should have dropped the cpu_ prefix
 when I made that decision.

Requested by:	bde
---
 sys/amd64/include/cpufunc.h |  2 +-
 sys/i386/include/cpufunc.h  |  2 +-
 sys/kern/kern_mutex.c       | 10 +++++-----
 sys/kern/subr_turnstile.c   | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index e0b7c996071..47f3b7650bf 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -561,7 +561,7 @@ load_dr7(u_int sel)
 }
 
 static __inline void
-cpu_pause(void)
+pause(void)
 {
 	__asm __volatile("pause");
 }
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index e0b7c996071..47f3b7650bf 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -561,7 +561,7 @@ load_dr7(u_int sel)
 }
 
 static __inline void
-cpu_pause(void)
+pause(void)
 {
 	__asm __volatile("pause");
 }
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index e1428b3d218..d22b02f642c 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -489,7 +489,7 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
 		if ((v = m->mtx_lock) == MTX_UNOWNED) {
 			mtx_unlock_spin(&sched_lock);
 #ifdef __i386__
-			cpu_pause();
+			pause();
 #endif
 			continue;
 		}
@@ -519,7 +519,7 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
 			(void *)(v | MTX_CONTESTED))) {
 			mtx_unlock_spin(&sched_lock);
 #ifdef __i386__
-			cpu_pause();
+			pause();
 #endif
 			continue;
 		}
@@ -534,7 +534,7 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
 		    owner->td_kse->ke_oncpu != NOCPU) {
 			mtx_unlock_spin(&sched_lock);
 #ifdef __i386__
-			cpu_pause();
+			pause();
 #endif
 			continue;
 		}
@@ -630,7 +630,7 @@ _mtx_lock_spin(struct mtx *m, int opts, const char *file, int line)
 		while (m->mtx_lock != MTX_UNOWNED) {
 			if (i++ < 10000000) {
 #ifdef __i386__
-				cpu_pause();
+				pause();
 #endif
 				continue;
 			}
@@ -644,7 +644,7 @@ _mtx_lock_spin(struct mtx *m, int opts, const char *file, int line)
 				panic("spin lock %s held by %p for > 5 seconds",
 				    m->mtx_object.lo_name, (void *)m->mtx_lock);
 #ifdef __i386__
-			cpu_pause();
+			pause();
 #endif
 		}
 		critical_enter();
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index e1428b3d218..d22b02f642c 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -489,7 +489,7 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
 		if ((v = m->mtx_lock) == MTX_UNOWNED) {
 			mtx_unlock_spin(&sched_lock);
 #ifdef __i386__
-			cpu_pause();
+			pause();
 #endif
 			continue;
 		}
@@ -519,7 +519,7 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
 			(void *)(v | MTX_CONTESTED))) {
 			mtx_unlock_spin(&sched_lock);
 #ifdef __i386__
-			cpu_pause();
+			pause();
 #endif
 			continue;
 		}
@@ -534,7 +534,7 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
 		    owner->td_kse->ke_oncpu != NOCPU) {
 			mtx_unlock_spin(&sched_lock);
 #ifdef __i386__
-			cpu_pause();
+			pause();
 #endif
 			continue;
 		}
@@ -630,7 +630,7 @@ _mtx_lock_spin(struct mtx *m, int opts, const char *file, int line)
 		while (m->mtx_lock != MTX_UNOWNED) {
 			if (i++ < 10000000) {
 #ifdef __i386__
-				cpu_pause();
+				pause();
 #endif
 				continue;
 			}
@@ -644,7 +644,7 @@ _mtx_lock_spin(struct mtx *m, int opts, const char *file, int line)
 				panic("spin lock %s held by %p for > 5 seconds",
 				    m->mtx_object.lo_name, (void *)m->mtx_lock);
 #ifdef __i386__
-			cpu_pause();
+			pause();
 #endif
 		}
 		critical_enter();