Rework mutex implementation selection

1 files changed, 5 insertions, 19 deletions

diff --git a/kern/mutex_types.h b/kern/mutex_types.h
index 4b7947fc..432eab30 100644
--- a/kern/mutex_types.h
+++ b/kern/mutex_types.h
@@ -21,24 +21,10 @@
 #ifndef _KERN_MUTEX_TYPES_H
 #define _KERN_MUTEX_TYPES_H
 
-#ifdef X15_MUTEX_PI
-
-#include <kern/rtmutex_types.h>
-
-/*
- * Do not directly alias rtmutex to make sure they cannot be used
- * with condition variables by mistake.
- */
-struct mutex {
-    struct rtmutex rtmutex;
-};
-
-#else /* X15_MUTEX_PI */
-
-struct mutex {
-    unsigned int state;
-};
-
-#endif /* X15_MUTEX_PI */
+#if defined(X15_MUTEX_PI)
+#include <kern/mutex/mutex_pi_types.h>
+#else
+#include <kern/mutex/mutex_plain_types.h>
+#endif
 
 #endif /* _KERN_MUTEX_TYPES_H */