Fix various warnings

[nameless-os.git] / boot / x86 / stage3 / loader.s

diff --git a/boot/x86/stage3/loader.s b/boot/x86/stage3/loader.s
index 2967c6ee7b1d9f00c1d9fb1ef732f02a10c3847e..747905d704ef8bc0ae3c50921d996c3bc5ac000e 100644 (file)
--- a/boot/x86/stage3/loader.s
+++ b/boot/x86/stage3/loader.s
@@ -64,6 +64,8 @@ _start:
        call read_clus_chain_unreal ; load kernel
        print kernel_loaded
        
+       call get_e820_map
+
        cli
        lgdt [gdt]
        mov eax, cr0
@@ -151,6 +153,7 @@ memcpy:
 %include "../fat32/fat32.s"
 %include "gdt.s"
 %include "print.s"
+%include "e820.s"
 
 in_protected:
 bits 32
@@ -164,9 +167,8 @@ bits 32
        call load_paging_structs
        call enable_paging
 
-       call 0xc0000000
-       hlt
-       jmp $-1
+       jmp 0x8:0xc0000000
+       nop
 
 kernel_name: db "KERNEL  BIN"
 begin: db "Nameless Bootloader revision ", GIT_REVISION, 0xd, 0xa, 0