Index: kernel/generic/include/atomic.h
===================================================================
--- kernel/generic/include/atomic.h	(revision e3306d0477902705968eca74bbf2f4b766535c78)
+++ kernel/generic/include/atomic.h	(revision 5f1d850c7ef9cee92e7484657faa82d8db56699d)
@@ -41,5 +41,4 @@
 
 typedef size_t atomic_count_t;
-typedef ssize_t atomic_signed_t;
 typedef atomic_size_t atomic_t;
 
@@ -77,10 +76,4 @@
 	atomic_exchange_explicit(var_addr, new_val, memory_order_relaxed)
 
-static inline bool test_and_set(atomic_t *val)
-{
-	return atomic_exchange(val, 1);
-}
-
-
 #endif
 
Index: uspace/lib/c/generic/private/futex.h
===================================================================
--- uspace/lib/c/generic/private/futex.h	(revision e3306d0477902705968eca74bbf2f4b766535c78)
+++ uspace/lib/c/generic/private/futex.h	(revision 5f1d850c7ef9cee92e7484657faa82d8db56699d)
@@ -81,5 +81,5 @@
 
 #define futex_give_to(fut, owner) ((void)0)
-#define futex_assert_is_locked(fut) assert((atomic_signed_t) (fut)->val.count <= 0)
+#define futex_assert_is_locked(fut) assert(atomic_load_explicit(&(fut)->val, memory_order_relaxed) <= 0)
 #define futex_assert_is_not_locked(fut) ((void)0)