Rename backtrace_kframe -> backtrace_hwtf [2/2]

[akaros.git] / kern / arch / x86 / init.c

diff --git a/kern/arch/x86/init.c b/kern/arch/x86/init.c
index 583ddde..fe35276 100644 (file)
--- a/kern/arch/x86/init.c
+++ b/kern/arch/x86/init.c
@@ -1,9 +1,5 @@
 /* See COPYRIGHT for copyright information. */
 
-#ifdef __SHARC__
-#pragma nosharc
-#endif
-
 #include <smp.h>
 
 #include <arch/pci.h>
@@ -12,6 +8,7 @@
 #include <arch/init.h>
 #include <console.h>
 #include <monitor.h>
+#include <arch/usb.h>
 
 struct ancillary_state x86_default_fpu;
 uint32_t kerndate;
@@ -45,7 +42,7 @@ static void irq_console(struct hw_trapframe *hw_tf, void *data)
                                return;
                        }
                        print_trapframe(hw_tf);
-                       backtrace_kframe(hw_tf);
+                       backtrace_hwtf(hw_tf);
                        return;
        }
        /* Do our work in an RKM, instead of interrupt context.  Note the RKM will
@@ -57,7 +54,7 @@ static void irq_console(struct hw_trapframe *hw_tf, void *data)
 static void cons_poller(void *arg)
 {
        while (1) {
-               udelay_sched(10000);
+               kthread_usleep(10000);
                irq_console(0, arg);
        }
 }
@@ -82,6 +79,7 @@ void arch_init()
        asm volatile ("fninit");
        save_fp_state(&x86_default_fpu); /* used in arch/trap.h for fpu init */
        pci_init();
+       vmm_init();
        // this returns when all other cores are done and ready to receive IPIs
        #ifdef CONFIG_SINGLE_CORE
                smp_percpu_init();
@@ -92,5 +90,11 @@ void arch_init()
 
        perfmon_init();
        cons_irq_init();
+       intel_lpc_init();
+#ifdef CONFIG_ENABLE_LEGACY_USB
+       printk("Legacy USB support enabled, expect SMM interference!\n");
+#else
+       usb_disable_legacy();
+#endif
        check_timing_stability();
 }