cherry pick device tree modifications from isa/arm64

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

diff --git a/lunaix-os/arch/x86/hal/apic.c b/lunaix-os/arch/x86/hal/apic.c
index 4e2501f93a95f600290eba6348b3cca112abd168..ddc2e31ef2471557122b8b6ddb4ab11d0b7b68bd 100644 (file)
--- a/lunaix-os/arch/x86/hal/apic.c
+++ b/lunaix-os/arch/x86/hal/apic.c
@@ -9,11 +9,11 @@
  *
  */
 
  *
  */
 

-#include "sys/x86_isa.h"
-#include <sys/cpu.h>
+#include "asm/x86.h"
+#include "asm/x86_cpu.h"

 
 

-#include "sys/apic.h"
-#include <sys/hart.h>
+#include "asm/soc/apic.h"
+#include <asm/hart.h>

 
 #include <lunaix/mm/mmio.h>
 #include <lunaix/spike.h>
 
 #include <lunaix/mm/mmio.h>
 #include <lunaix/spike.h>


@@ -43,7 +43,7 @@ apic_init()
     // As we are going to use APIC, disable the old 8259 PIC
     pic_disable();
 
     // As we are going to use APIC, disable the old 8259 PIC
     pic_disable();
 

-    _apic_base = (ptr_t)ioremap(__APIC_BASE_PADDR, 4096);
+    _apic_base = ioremap(__APIC_BASE_PADDR, 4096);

 
     // Hardware enable the APIC
     // By setting bit 11 of IA32_APIC_BASE register
 
     // Hardware enable the APIC
     // By setting bit 11 of IA32_APIC_BASE register