diff --git a/init/main.c b/init/main.c index 9f17df4..71fe154 100644 --- a/init/main.c +++ b/init/main.c @@ -179,7 +179,4 @@ int main(char* initrd, uint32_t initrd_sz) { vga_write_string("CALLING FPUTS\n"); fputs("FPUTS String",file); vga_write_string("FPUTS RETURNED\n"); - for(;;) { - yield(); - } } diff --git a/kernel/kernel.c b/kernel/kernel.c index f14bb25..b8bfd1c 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -107,8 +107,5 @@ void kmain(struct multiboot_boot_header_tag* hdr) { initrd2=put_data(cr3,initrd2,initrd_sz); createTaskCr3Param((void*)header.entry,cr3,(uint32_t)initrd2,initrd_sz); exit(0); - for(;;) { - yield(); - } } } diff --git a/kernel/start.asm b/kernel/start.asm index bf2d837..dbce2fd 100644 --- a/kernel/start.asm +++ b/kernel/start.asm @@ -1,8 +1,11 @@ extern main +extern exit extern __stdio_init global _start _start: call __stdio_init call main + push 0 + call exit ret