restructure the aa64 isa related header files.

[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 988f97654a4a25cc9beda371425b463da175898e..533ded95c0d398c099a334bb6a1d0bbbfebc07c6 100644 (file)
--- a/lunaix-os/arch/x86/arch.c
+++ b/lunaix-os/arch/x86/arch.c
@@ -1,12 +1,11 @@
 #include <hal/hwtimer.h>
 
 #include <hal/hwtimer.h>
 

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

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

-#include "sys/int_handler.h"
-#include "sys/x86_isa.h"
-#include "sys/hart.h"
+#include "asm/x86.h"
+#include "asm/hart.h"

 
 #include "hal/apic_timer.h"
 
 
 #include "hal/apic_timer.h"
 


@@ -41,7 +40,7 @@ select_platform_timer()
 
     // TODO select alternatives...
 
 
     // TODO select alternatives...
 

-    panick("no timer to use.");
+    fail("no timer to use.");

 }
 
 void
 }
 
 void