diff options
| -rw-r--r-- | sys/amd64/include/cpufunc.h | 2 | ||||
| -rw-r--r-- | sys/i386/include/cpufunc.h | 2 | ||||
| -rw-r--r-- | sys/kern/kern_mutex.c | 10 | ||||
| -rw-r--r-- | 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 e0b7c99..47f3b76 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 e0b7c99..47f3b76 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 e1428b3..d22b02f 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 e1428b3..d22b02f 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(); |
