diff options
Diffstat (limited to 'kernel/src/main.c')
| -rw-r--r-- | kernel/src/main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/src/main.c b/kernel/src/main.c index 126c69e..d5e2492 100644 --- a/kernel/src/main.c +++ b/kernel/src/main.c @@ -23,6 +23,8 @@ #include <ioapic.h> #include <atomic.h> #include <pmm.h> +#include <scheduler.h> +#include <process.h> int kernel_main(mb2_tag_header *multiboot_bootinfo, uint32_t multiboot_magic); int kernel_main(mb2_tag_header *multiboot_bootinfo, uint32_t multiboot_magic) @@ -49,11 +51,14 @@ int kernel_main(mb2_tag_header *multiboot_bootinfo, uint32_t multiboot_magic) parse_madt(); apic_remap_interrupts(); enable_interrupts(); - init_ap_cpus(); - jump_userspace(); + + init_scheduler(); + + /* init_ap_cpus(); */ + /* jump_userspace(); */ for (;;) { - __asm__ __volatile__("hlt;"); + __asm__ __volatile__("pause; hlt;"); } return 0; } |