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
This commit is contained in:
parent
aecf4d561b
commit
0228ea4e0b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=97113
@ -561,7 +561,7 @@ load_dr7(u_int sel)
|
||||
}
|
||||
|
||||
static __inline void
|
||||
cpu_pause(void)
|
||||
pause(void)
|
||||
{
|
||||
__asm __volatile("pause");
|
||||
}
|
||||
|
@ -561,7 +561,7 @@ load_dr7(u_int sel)
|
||||
}
|
||||
|
||||
static __inline void
|
||||
cpu_pause(void)
|
||||
pause(void)
|
||||
{
|
||||
__asm __volatile("pause");
|
||||
}
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user