diff --git a/arch/x86_64/include/socks/machine/init.h b/arch/x86_64/include/socks/machine/init.h index cbdf5de..6c594e6 100644 --- a/arch/x86_64/include/socks/machine/init.h +++ b/arch/x86_64/include/socks/machine/init.h @@ -3,6 +3,6 @@ #include -extern int machine_init(uintptr_t arg); +extern int ml_init(uintptr_t arg); #endif diff --git a/arch/x86_64/init.c b/arch/x86_64/init.c new file mode 100644 index 0000000..3dd8e14 --- /dev/null +++ b/arch/x86_64/init.c @@ -0,0 +1,15 @@ +#include + +static ml_cpu_block g_bootstrap_cpu = {0}; + +static void bootstrap_cpu_init(void) +{ + ml_cpu_block_init(&g_bootstrap_cpu); + ml_cpu_block_use(&g_bootstrap_cpu); +} + +int ml_init(uintptr_t arg) +{ + bootstrap_cpu_init(); + return 0; +} diff --git a/init/main.c b/init/main.c index 4c50633..8295f86 100644 --- a/init/main.c +++ b/init/main.c @@ -15,8 +15,7 @@ void bootstrap_cpu_init(void) void kernel_init(uintptr_t arg) { - bootstrap_cpu_init(); - console_init(); + ml_init(arg); for (int i = 0; i < 8; i++) { printf("Line %d\n", i);