Switch to initialization operations

1 files changed, 11 insertions, 2 deletions

diff --git a/kern/sleepq.c b/kern/sleepq.c
index d8bbbdd..cc85705 100644
--- a/kern/sleepq.c
+++ b/kern/sleepq.c
@@ -193,7 +193,7 @@ sleepq_ctor(void *ptr)
     sleepq->next_free = NULL;
 }
 
-void __init
+static int __init
 sleepq_bootstrap(void)
 {
     unsigned int i;
@@ -205,15 +205,24 @@ sleepq_bootstrap(void)
     for (i = 0; i < ARRAY_SIZE(sleepq_cond_htable); i++) {
         sleepq_bucket_init(&sleepq_cond_htable[i]);
     }
+
+    return 0;
 }
 
-void __init
+INIT_OP_DEFINE(sleepq_bootstrap);
+
+static int __init
 sleepq_setup(void)
 {
     kmem_cache_init(&sleepq_cache, "sleepq", sizeof(struct sleepq),
                     CPU_L1_SIZE, sleepq_ctor, 0);
+    return 0;
 }
 
+INIT_OP_DEFINE(sleepq_setup,
+               INIT_OP_DEP(kmem_setup, true),
+               INIT_OP_DEP(sleepq_bootstrap, true));
+
 struct sleepq *
 sleepq_create(void)
 {