From 4f510c7fef17d9a8c03ed7c7ecad9914639c3bad Mon Sep 17 00:00:00 2001
From: "K. Lange" <klange@toaruos.org>
Date: Sun, 30 Jan 2022 21:28:10 +0900
Subject: [PATCH] x86_64: fixup include paths; mmu.h is shared now

---
 kernel/arch/x86_64/idt.c  | 2 +-
 kernel/arch/x86_64/mmu.c  | 2 +-
 kernel/arch/x86_64/smp.c  | 2 +-
 kernel/arch/x86_64/user.c | 2 +-
 modules/vbox.c            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/arch/x86_64/idt.c b/kernel/arch/x86_64/idt.c
index 47b3d925..a45db457 100644
--- a/kernel/arch/x86_64/idt.c
+++ b/kernel/arch/x86_64/idt.c
@@ -23,12 +23,12 @@
 #include <kernel/hashmap.h>
 #include <kernel/module.h>
 #include <kernel/ksym.h>
+#include <kernel/mmu.h>
 
 #include <sys/time.h>
 #include <sys/utsname.h>
 #include <sys/ptrace.h>
 
-#include <kernel/arch/x86_64/mmu.h>
 #include <kernel/arch/x86_64/ports.h>
 #include <kernel/arch/x86_64/pml.h>
 #include <kernel/arch/x86_64/regs.h>
diff --git a/kernel/arch/x86_64/mmu.c b/kernel/arch/x86_64/mmu.c
index 02eafa9b..21ea59a0 100644
--- a/kernel/arch/x86_64/mmu.c
+++ b/kernel/arch/x86_64/mmu.c
@@ -16,8 +16,8 @@
 #include <kernel/process.h>
 #include <kernel/spinlock.h>
 #include <kernel/misc.h>
+#include <kernel/mmu.h>
 #include <kernel/arch/x86_64/pml.h>
-#include <kernel/arch/x86_64/mmu.h>
 
 extern void arch_tlb_shootdown(uintptr_t);
 
diff --git a/kernel/arch/x86_64/smp.c b/kernel/arch/x86_64/smp.c
index ccab5a85..cb7829ad 100644
--- a/kernel/arch/x86_64/smp.c
+++ b/kernel/arch/x86_64/smp.c
@@ -17,8 +17,8 @@
 #include <kernel/args.h>
 #include <kernel/time.h>
 #include <kernel/multiboot.h>
+#include <kernel/mmu.h>
 #include <kernel/arch/x86_64/acpi.h>
-#include <kernel/arch/x86_64/mmu.h>
 
 __attribute__((used))
 __attribute__((naked))
diff --git a/kernel/arch/x86_64/user.c b/kernel/arch/x86_64/user.c
index 52c477b7..f5bdec66 100644
--- a/kernel/arch/x86_64/user.c
+++ b/kernel/arch/x86_64/user.c
@@ -10,8 +10,8 @@
 #include <stdint.h>
 #include <kernel/process.h>
 #include <kernel/string.h>
+#include <kernel/mmu.h>
 #include <kernel/arch/x86_64/regs.h>
-#include <kernel/arch/x86_64/mmu.h>
 #include <kernel/arch/x86_64/ports.h>
 
 /**
diff --git a/modules/vbox.c b/modules/vbox.c
index 2bb29eb0..f4b42932 100644
--- a/modules/vbox.c
+++ b/modules/vbox.c
@@ -25,10 +25,10 @@
 #include <kernel/mouse.h>
 #include <kernel/args.h>
 #include <kernel/module.h>
+#include <kernel/mmu.h>
 
 #include <kernel/arch/x86_64/regs.h>
 #include <kernel/arch/x86_64/ports.h>
-#include <kernel/arch/x86_64/mmu.h>
 #include <kernel/arch/x86_64/irq.h>
 
 #define VBOX_VENDOR_ID 0x80EE