Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / arch / x86 / arch.c

diff --git a/lunaix-os/arch/x86/arch.c b/lunaix-os/arch/x86/arch.c
index 533ded95c0d398c099a334bb6a1d0bbbfebc07c6..e98bdd9de7b3eca8b06085598b126d7c3f273270 100644 (file)
--- a/lunaix-os/arch/x86/arch.c
+++ b/lunaix-os/arch/x86/arch.c
@@ -1,9 +1,10 @@
 #include <hal/hwtimer.h>
 
 #include <hal/hwtimer.h>
 

-#include <asm-generic/isrm.h>

 #include <lunaix/spike.h>
 #include <lunaix/process.h>
 
 #include <lunaix/spike.h>
 #include <lunaix/process.h>
 

+#include <asm/x86_isrm.h>
+

 #include "asm/x86.h"
 #include "asm/hart.h"
 
 #include "asm/x86.h"
 #include "asm/hart.h"
 


@@ -28,21 +29,6 @@ arch_preinit()
     isrm_bindiv(LUNAIX_SYS_CALL, syscall_hndlr);
 }
 
     isrm_bindiv(LUNAIX_SYS_CALL, syscall_hndlr);
 }
 

-struct hwtimer*
-select_platform_timer()
-{
-    struct hwtimer* timer;
-
-    timer = apic_hwtimer_context();
-    if (timer->supported(timer)) {
-        return timer;
-    }
-
-    // TODO select alternatives...
-
-    fail("no timer to use.");
-}
-

 void
 update_tss()
 {
 void
 update_tss()
 {