summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_mutex.c
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-05-22 20:32:39 +0000
committerjhb <jhb@FreeBSD.org>2002-05-22 20:32:39 +0000
commit096c0249dc8295a7a40933495392d2e1d5342831 (patch)
tree08151c57646bcea9a9226d45cf36d0066a2a1933 /sys/kern/kern_mutex.c
parent6819a7b589dd9fb34ba8d012aa55be2e741e081a (diff)
downloadFreeBSD-src-096c0249dc8295a7a40933495392d2e1d5342831.zip
FreeBSD-src-096c0249dc8295a7a40933495392d2e1d5342831.tar.gz
Rename pause() to ia32_pause() so it doesn't conflict with the pause()
function defined in <unistd.h>. I didn't #ifdef _KERNEL it because the mutex implementation in libpthread will probably need this.
Diffstat (limited to 'sys/kern/kern_mutex.c')
-rw-r--r--sys/kern/kern_mutex.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index d22b02f..ab564b7 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__
- pause();
+ ia32_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__
- pause();
+ ia32_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__
- pause();
+ ia32_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__
- pause();
+ ia32_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__
- pause();
+ ia32_pause();
#endif
}
critical_enter();
OpenPOWER on IntegriCloud