Clean up init op dependencies between syscnt and mutex

5 files changed, 39 insertions, 3 deletions

diff --git a/kern/mutex/mutex_adaptive.c b/kern/mutex/mutex_adaptive.c
index 3e6b610b..bda54532 100644
--- a/kern/mutex/mutex_adaptive.c
+++ b/kern/mutex/mutex_adaptive.c
@@ -318,6 +318,15 @@ mutex_adaptive_unlock_slow(struct mutex *mutex)
 }
 
 static int
+mutex_adaptive_bootstrap(void)
+{
+    return 0;
+}
+
+INIT_OP_DEFINE(mutex_adaptive_bootstrap,
+               INIT_OP_DEP(thread_setup_booter, true));
+
+static int
 mutex_adaptive_setup(void)
 {
     mutex_adaptive_setup_debug();
@@ -325,6 +334,7 @@ mutex_adaptive_setup(void)
 }
 
 INIT_OP_DEFINE(mutex_adaptive_setup,
+               INIT_OP_DEP(mutex_adaptive_bootstrap, true),
 #ifdef CONFIG_MUTEX_DEBUG
                INIT_OP_DEP(syscnt_setup, true),
 #endif /* CONFIG_MUTEX_DEBUG */
diff --git a/kern/mutex/mutex_adaptive_i.h b/kern/mutex/mutex_adaptive_i.h
index a8598e60..6ff1277e 100644
--- a/kern/mutex/mutex_adaptive_i.h
+++ b/kern/mutex/mutex_adaptive_i.h
@@ -133,8 +133,14 @@ mutex_impl_unlock(struct mutex *mutex)
     }
 }
 
-#define mutex_impl_setup mutex_adaptive_setup
+/*
+ * Mutex init operations. See kern/mutex.h.
+ */
 
+#define mutex_impl_bootstrap mutex_adaptive_bootstrap
+INIT_OP_DECLARE(mutex_adaptive_bootstrap);
+
+#define mutex_impl_setup mutex_adaptive_setup
 INIT_OP_DECLARE(mutex_adaptive_setup);
 
 #endif /* _KERN_MUTEX_ADAPTIVE_I_H */
diff --git a/kern/mutex/mutex_pi_i.h b/kern/mutex/mutex_pi_i.h
index 2d5a2b6f..14f63be0 100644
--- a/kern/mutex/mutex_pi_i.h
+++ b/kern/mutex/mutex_pi_i.h
@@ -65,6 +65,11 @@ mutex_impl_unlock(struct mutex *mutex)
     rtmutex_unlock(&mutex->rtmutex);
 }
 
-#define mutex_impl_setup rtmutex_setup
+/*
+ * Mutex init operations. See kern/mutex.h.
+ */
+
+#define mutex_impl_bootstrap    rtmutex_bootstrap
+#define mutex_impl_setup        rtmutex_setup
 
 #endif /* _KERN_MUTEX_PI_I_H */
diff --git a/kern/mutex/mutex_plain.c b/kern/mutex/mutex_plain.c
index 8945014f..266bd70b 100644
--- a/kern/mutex/mutex_plain.c
+++ b/kern/mutex/mutex_plain.c
@@ -159,6 +159,14 @@ mutex_plain_unlock_slow(struct mutex *mutex)
 }
 
 static int
+mutex_plain_bootstrap(void)
+{
+    return 0;
+}
+
+INIT_OP_DEFINE(mutex_plain_bootstrap);
+
+static int
 mutex_plain_setup(void)
 {
     mutex_plain_setup_debug();
@@ -166,6 +174,7 @@ mutex_plain_setup(void)
 }
 
 INIT_OP_DEFINE(mutex_plain_setup,
+               INIT_OP_DEP(mutex_plain_bootstrap, true),
 #ifdef CONFIG_MUTEX_DEBUG
                INIT_OP_DEP(syscnt_setup, true),
 #endif /* CONFIG_MUTEX_DEBUG */
diff --git a/kern/mutex/mutex_plain_i.h b/kern/mutex/mutex_plain_i.h
index fe973086..74def89e 100644
--- a/kern/mutex/mutex_plain_i.h
+++ b/kern/mutex/mutex_plain_i.h
@@ -127,8 +127,14 @@ mutex_impl_unlock(struct mutex *mutex)
     }
 }
 
-#define mutex_impl_setup mutex_plain_setup
+/*
+ * Mutex init operations. See kern/mutex.h.
+ */
 
+#define mutex_impl_bootstrap mutex_plain_bootstrap
+INIT_OP_DECLARE(mutex_plain_bootstrap);
+
+#define mutex_impl_setup mutex_plain_setup
 INIT_OP_DECLARE(mutex_plain_setup);
 
 #endif /* _KERN_MUTEX_PLAIN_I_H */