From 54043288cbbc091f633f5f25eb07294cdc1f8370 Mon Sep 17 00:00:00 2001
From: Bananymous <bananymousosq@gmail.com>
Date: Mon, 23 Jan 2023 18:12:52 +0200
Subject: [PATCH] Kernel: Move CPUID out of arch/

CPUID instructions behaves the same on x86 and x86_64. I am not
planning on supporting any non x86 based architectures.
---
 kernel/Makefile                        | 1 +
 kernel/arch/i386/make.config           | 1 -
 kernel/{arch/i386 => kernel}/CPUID.cpp | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename kernel/{arch/i386 => kernel}/CPUID.cpp (100%)

diff --git a/kernel/Makefile b/kernel/Makefile
index 449c88ed..3a224328 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -32,6 +32,7 @@ BUILDDIR=$(abspath build)
 KERNEL_OBJS=				\
 $(KERNEL_ARCH_OBJS)			\
 kernel/build_libc.o			\
+kernel/CPUID.o				\
 kernel/font.o				\
 kernel/Input.o				\
 kernel/kernel.o				\
diff --git a/kernel/arch/i386/make.config b/kernel/arch/i386/make.config
index 04d6851b..7e789dc9 100644
--- a/kernel/arch/i386/make.config
+++ b/kernel/arch/i386/make.config
@@ -6,7 +6,6 @@ KERNEL_ARCH_LIBS=
 KERNEL_ARCH_OBJS=		\
 $(ARCHDIR)/APIC.o		\
 $(ARCHDIR)/boot.o		\
-$(ARCHDIR)/CPUID.o		\
 $(ARCHDIR)/IDT.o		\
 $(ARCHDIR)/MMU.o		\
  
\ No newline at end of file
diff --git a/kernel/arch/i386/CPUID.cpp b/kernel/kernel/CPUID.cpp
similarity index 100%
rename from kernel/arch/i386/CPUID.cpp
rename to kernel/kernel/CPUID.cpp