@@ -479,45 +479,25 @@
 
 	return r;
 }
 
 static OF_INLINE void
-of_memory_barrier_sync(void)
+of_memory_barrier(void)
 {
 	__asm__ __volatile__ (
 	    "mfence" ::: "memory"
 	);
 }
 
 static OF_INLINE void
-of_memory_barrier_enter(void)
-{
-	__asm__ __volatile__ (
-	    "mfence" ::: "memory"
-	);
-}
-
-static OF_INLINE void
-of_memory_barrier_exit(void)
-{
-	__asm__ __volatile__ (
-	    "mfence" ::: "memory"
-	);
-}
-
-static OF_INLINE void
-of_memory_barrier_producer(void)
-{
-	__asm__ __volatile__ (
-	    "sfence" ::: "memory"
-	);
-}
-
-static OF_INLINE void
-of_memory_barrier_consumer(void)
-{
-	__asm__ __volatile__ (
-	    "lfence" ::: "memory"
-	);
+of_memory_barrier_acquire(void)
+{
+	__asm__ __volatile__ ("" ::: "memory");
+}
+
+static OF_INLINE void
+of_memory_barrier_release(void)
+{
+	__asm__ __volatile__ ("" ::: "memory");
 }
 
 OF_ASSUME_NONNULL_END