diff options
| author | Richard Braun <rbraun@sceen.net> | 2018-04-18 21:45:12 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2018-04-19 01:45:43 +0200 |
| commit | 8790d75d93c7e06b7b93c1078260aaf1e4ea25ca (patch) | |
| tree | 478eb3eb2607f1312d7b4e64cab23f3bcb0268ee /kern/rtmutex.c | |
| parent | 3640f94ee392b19de48360d2d026a7f581447049 (diff) | |
kern/atomic: remove shortcuts
These shortcuts just don't bring enough value.
Diffstat (limited to 'kern/rtmutex.c')
| -rw-r--r-- | kern/rtmutex.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kern/rtmutex.c b/kern/rtmutex.c index 55d17cdc..6567b063 100644 --- a/kern/rtmutex.c +++ b/kern/rtmutex.c @@ -107,7 +107,7 @@ rtmutex_lock_slow_common(struct rtmutex *rtmutex, bool timed, uint64_t ticks) bits = RTMUTEX_CONTENDED; for (;;) { - owner = atomic_cas_acquire(&rtmutex->owner, bits, self | bits); + owner = atomic_cas(&rtmutex->owner, bits, self | bits, ATOMIC_ACQUIRE); assert((owner & bits) == bits); if (owner == bits) { @@ -211,8 +211,9 @@ rtmutex_unlock_slow(struct rtmutex *rtmutex) } } - owner = atomic_swap_release(&rtmutex->owner, - RTMUTEX_FORCE_WAIT | RTMUTEX_CONTENDED); + owner = atomic_swap(&rtmutex->owner, + RTMUTEX_FORCE_WAIT | RTMUTEX_CONTENDED, + ATOMIC_RELEASE); assert(rtmutex_get_thread(owner) == thread_self()); turnstile_disown(turnstile); |