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

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

diff --git a/lunaix-os/arch/x86/hal/ioapic.c b/lunaix-os/arch/x86/hal/ioapic.c
index 83ce6a09a2a476588cfe321d2a7f9a0b1654cb02..e03d4b5d7334ba3183d63e929e5bc21fbca6778c 100644 (file)
--- a/lunaix-os/arch/x86/hal/ioapic.c
+++ b/lunaix-os/arch/x86/hal/ioapic.c
@@ -2,9 +2,9 @@
 
 #include <lunaix/mm/mmio.h>
 
-#include <sys/hart.h>
-#include "sys/ioapic.h"
-#include "sys/x86_isa.h"
+#include <asm/hart.h>
+#include "asm/soc/ioapic.h"
+#include "asm/x86.h"
 
 #define IOAPIC_IOREGSEL 0x00
 #define IOAPIC_IOWIN 0x10
@@ -38,7 +38,7 @@ ioapic_init()
     acpi_context* acpi_ctx = acpi_get_context();
 
     _ioapic_base =
-      (ptr_t)ioremap(acpi_ctx->madt.ioapic->ioapic_addr & ~0xfff, 4096);
+        ioremap(acpi_ctx->madt.ioapic->ioapic_addr & ~0xfff, 4096);
 }
 
 void