d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch up to some of the changes to _getlock_spin_block. Specifically,

Browse Source 
use _obtain_lock() instead of a manual atomic_cmpset_ptr.
This commit is contained in:
John Baldwin 2000-10-20 19:54:47 +00:00
parent bb352e20a2
commit 8cc99fae9a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/alpha/include/mutex.h
View File

@ -72,11 +72,11 @@ extern char STR_SIEN[];
#define _getlock_spin_block(mp, tid, type) do { \
u_int _ipl = alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH); \
if (atomic_cmpset_64(&(mp)->mtx_lock, MTX_UNOWNED, (tid)) == 0) \
if (!_obtain_lock(mp, tid)) \
mtx_enter_hard(mp, (type) & MTX_HARDOPTS, _ipl); \
else { \
alpha_mb(); \
(mp)->mtx_saveipl = _ipl; \
(mp)->mtx_saveintr = _ipl; \
} \
} while (0)
@ -97,13 +97,13 @@ extern char STR_SIEN[];
stq_c a0, lck+MTX_LOCK; \
beq a0, 1b; \
mb; \
stl v0, lck+MTX_SAVEIPL
stl v0, lck+MTX_SAVEINTR
#define MTX_EXIT(lck) \
mb; \
ldiq a0, MTX_UNOWNED; \
stq a0, lck+MTX_LOCK; \
ldl a0, lck+MTX_SAVEIPL; \
ldl a0, lck+MTX_SAVEINTR; \
call_pal PAL_OSF1_swpipl
#endif /* !LOCORE */

8
sys/powerpc/include/mutex.h
View File

@ -72,11 +72,11 @@ extern char STR_SIEN[];
#define _getlock_spin_block(mp, tid, type) do { \
u_int _ipl = alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH); \
if (atomic_cmpset_64(&(mp)->mtx_lock, MTX_UNOWNED, (tid)) == 0) \
if (!_obtain_lock(mp, tid)) \
mtx_enter_hard(mp, (type) & MTX_HARDOPTS, _ipl); \
else { \
alpha_mb(); \
(mp)->mtx_saveipl = _ipl; \
(mp)->mtx_saveintr = _ipl; \
} \
} while (0)
@ -97,13 +97,13 @@ extern char STR_SIEN[];
stq_c a0, lck+MTX_LOCK; \
beq a0, 1b; \
mb; \
stl v0, lck+MTX_SAVEIPL
stl v0, lck+MTX_SAVEINTR
#define MTX_EXIT(lck) \
mb; \
ldiq a0, MTX_UNOWNED; \
stq a0, lck+MTX_LOCK; \
ldl a0, lck+MTX_SAVEIPL; \
ldl a0, lck+MTX_SAVEINTR; \
call_pal PAL_OSF1_swpipl
#endif /* !LOCORE */