1 files changed, 4 insertions, 6 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index eb75d32..94d1c20 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -16,12 +16,11 @@ extern void switch_to_user();
 void kernel_main() {
     vga_log("Installing basic features of Melvix...", 0);
     // Install features
-    // memory_init();
-    timer_install();
+    memory_init();
     gdt_install();
     init_serial();
     paging_install();
-    acpi_install();
+    // acpi_install();
     idt_install();
     isrs_install();
     irq_install();
@@ -31,6 +30,7 @@ void kernel_main() {
     asm volatile ("cli");
     mouse_install();
     keyboard_install();
+    timer_install();
     asm volatile ("sti");
 
     // Get hardware information
@@ -62,7 +62,5 @@ void kernel_main() {
     */
 
     // asm volatile  ("div %0" :: "r"(0)); // Exception testing x/0
-    loop:
-    asm volatile ("hlt");
-    goto loop;
+    halt_loop();
 }