aboutsummaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorMarvin Borner2021-04-29 23:59:48 +0200
committerMarvin Borner2021-04-29 23:59:48 +0200
commit3a3d50d7eb0f4fdbb9beaf16bacfa98689cc448c (patch)
treed837ed9ed9470a20b66b28b6083d30865d7e6016 /kernel/main.c
parentf8e47b6b0c0578c52d82c0e243620361b87a4abe (diff)
Alright!
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/main.c b/kernel/main.c
index 37dd2da..023190a 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -1,6 +1,5 @@
// MIT License, Copyright (c) 2020 Marvin Borner
-#include <boot.h>
#include <cpu.h>
#include <fs.h>
#include <gdt.h>
@@ -21,15 +20,15 @@
PROTECTED extern u32 __stack_chk_guard;
PROTECTED u32 __stack_chk_guard;
-int kernel_main(u32 magic, u32 addr); // Decl
-int kernel_main(u32 magic, u32 addr)
+int kernel_main(u32 magic, u32 addr, u32 esp); // Decl
+int kernel_main(u32 magic, u32 addr, u32 esp)
{
// Serial connection
serial_install();
serial_print("\nKernel was compiled at " __TIME__ " on " __DATE__ "\n");
serial_print("Serial connected!\n");
- gdt_install();
+ gdt_install(esp);
multiboot_init(magic, addr);