Code-base clean-up and refactoring (#47)

[lunaix-os.git] / lunaix-os / kernel / kinit.c

diff --git a/lunaix-os/kernel/kinit.c b/lunaix-os/kernel/kinit.c
index a08418303f030c558e36a425d1172990eb9d5722..16c7976867e7da0252ec6fe3890a3d6245a3c95b 100644 (file)
--- a/lunaix-os/kernel/kinit.c
+++ b/lunaix-os/kernel/kinit.c
@@ -2,13 +2,14 @@
 #include <lunaix/block.h>
 #include <lunaix/boot_generic.h>
 #include <lunaix/device.h>
-#include <lunaix/foptions.h>
 #include <lunaix/input.h>
+
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
+
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/spike.h>
@@ -18,14 +19,9 @@
 #include <lunaix/syslog.h>
 #include <lunaix/sections.h>
 
-#include <hal/acpi/acpi.h>
 #include <hal/devtree.h>
 
-#include <sys/abi.h>
-#include <sys/mm/mm_defs.h>
-
-#include <klibc/strfmt.h>
-#include <klibc/string.h>
+#include <asm/mm_defs.h>
 
 LOG_MODULE("kinit")
 
@@ -59,7 +55,7 @@ kmem_init(struct boot_handoff* bhctx)
 
     unsigned int i = ptep_vfn(ptep);
     do {
-        if (l0tep_implie_vmnts(ptep)) {
+        if (lntep_implie_vmnts(ptep, L0T_SIZE)) {
             ptep++;
             continue;
         }
@@ -118,8 +114,6 @@ __remap_and_load_dtb(struct boot_handoff* bhctx)
 void
 kernel_bootstrap(struct boot_handoff* bhctx)
 {
-    vmm_init();
-
     pmm_init(bhctx);
     // now we can start reserving physical space