From 72ed0dc2f153e7cf1d6e96f86a773bbe490e9e1c Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Tue, 13 Jun 2017 21:23:50 +0200
Subject: Various atomic access fixes

---
 kern/rtmutex.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kern/rtmutex.c')

diff --git a/kern/rtmutex.c b/kern/rtmutex.c
index 09f011c4..e78c3899 100644
--- a/kern/rtmutex.c
+++ b/kern/rtmutex.c
@@ -29,7 +29,7 @@
 static void
 rtmutex_set_contended(struct rtmutex *rtmutex)
 {
-    atomic_or_acq_rel(&rtmutex->owner, RTMUTEX_CONTENDED);
+    atomic_or(&rtmutex->owner, RTMUTEX_CONTENDED, ATOMIC_RELEASE);
 }
 
 void
@@ -64,7 +64,7 @@ rtmutex_lock_slow(struct rtmutex *rtmutex)
     turnstile_own(turnstile);
 
     if (turnstile_empty(turnstile)) {
-        prev_owner = atomic_swap_acquire(&rtmutex->owner, owner);
+        prev_owner = atomic_swap(&rtmutex->owner, owner, ATOMIC_RELAXED);
         assert(prev_owner == (owner | bits));
     }
 
-- 
cgit v1.2.3