Merge branch 'master' into isa/arm64

[lunaix-os.git] / lunaix-os / arch / x86 / boot / x86_64 / init64.c

diff --git a/lunaix-os/arch/x86/boot/x86_64/init64.c b/lunaix-os/arch/x86/boot/x86_64/init64.c
index bab017366c376202b660ed774ad51987310469e5..ad5de8585500700a5d5ea70ac851c964850f2ee1 100644 (file)
--- a/lunaix-os/arch/x86/boot/x86_64/init64.c
+++ b/lunaix-os/arch/x86/boot/x86_64/init64.c
@@ -1,11 +1,12 @@
 #include "sys/boot/archinit.h"
-#include "sys/crx.h"
-#include "sys/cpu.h"
+#include "asm/x86_cpu.h"
+
+ptr_t __multiboot_addr boot_data;
 
 void boot_text
-x86_init(struct multiboot_info* mb)
+x86_init(ptr_t mb)
 {
-    mb_parse(mb);
+    __multiboot_addr = mb;
 
     cr4_setfeature(CR4_PCIDE);