Merge branch 'drive'

[nameless-os.git] / kernel / entry.s

diff --git a/kernel/entry.s b/kernel/entry.s
index 236b81e967e459e4c6f684d137726dbf42743677..10c95e8985955184b0b8f0afde73f5c99c692d13 100644 (file)
--- a/kernel/entry.s
+++ b/kernel/entry.s
@@ -1,5 +1,11 @@
-       bits 32
-       extern _start
+bits 32
+extern kmain
+extern __STACK_BOTTOM__
 
-       call _start
-       jmp $
+global _start
+_start:
+       mov ebp, __STACK_BOTTOM__
+       mov esp, ebp
+       call kmain
+       hlt
+       jmp $-1