From 1a413189abc220efbb782d4f1d74181b6133aaf1 Mon Sep 17 00:00:00 2001
From: Max Wash <mbswash@gmail.com>
Date: Mon, 6 Mar 2023 11:08:02 +0000
Subject: [PATCH] kernel: move object_bootstrap() call to kernel_init()

---
 arch/user/init.c   | 2 --
 arch/x86_64/init.c | 2 --
 init/main.c        | 3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/user/init.c b/arch/user/init.c
index a35da3b..f4a2e43 100644
--- a/arch/user/init.c
+++ b/arch/user/init.c
@@ -54,8 +54,6 @@ int ml_init(uintptr_t arg)
 	};
 
 	vm_bootstrap(vm_zones, sizeof vm_zones / sizeof vm_zones[0]);
-
-	object_bootstrap();
 	
 	return 0;
 }
diff --git a/arch/x86_64/init.c b/arch/x86_64/init.c
index 576f228..b9ff1d3 100644
--- a/arch/x86_64/init.c
+++ b/arch/x86_64/init.c
@@ -62,7 +62,5 @@ int ml_init(uintptr_t arg)
 
 	vm_bootstrap(vm_zones, sizeof vm_zones / sizeof vm_zones[0]);
 
-	object_bootstrap();
-
 	return 0;
 }
diff --git a/init/main.c b/init/main.c
index 9aeb11d..ee686e8 100644
--- a/init/main.c
+++ b/init/main.c
@@ -2,6 +2,7 @@
 #include <socks/init.h>
 #include <socks/test.h>
 #include <socks/printk.h>
+#include <socks/object.h>
 #include <socks/machine/init.h>
 #include <socks/machine/cpu.h>
 
@@ -18,6 +19,8 @@ void kernel_init(uintptr_t arg)
 {
 	ml_init(arg);
 
+	object_bootstrap();
+
 	run_all_tests();
 	
 	ml_halt_cpu();