Rename cpu definitions to cpu.h and cpuop.h

lib/libc/posix/mman.c

@@ -3,12 +3,8 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
-#if defined(__x86_64__)
 #include <sys/cdefs.h>
-#include <machine/amd64.h>
-#else
-#error "Unsupported Architecture!"
-#endif
+#include <machine/cpu.h>
 
 #include <syscall.h>
 

sys/amd64/critical.c

@@ -8,8 +8,8 @@
 #include <sys/mp.h>
 #include <sys/spinlock.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 uint32_t lockLevel[MAX_CPUS];
 

sys/amd64/debug.c

@@ -7,8 +7,8 @@
 #include <sys/kdebug.h>
 #include <sys/mp.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/atomic.h>
 #include <machine/trap.h>
 #include <machine/lapic.h>

sys/amd64/include/cpu.h

@@ -223,7 +223,7 @@ typedef struct XSAVEArea
 #define MSR_CSTAR   0xC0000083
 #define MSR_SFMASK  0xC0000084
 
-#include "amd64op.h"
+#include "cpuop.h"
 
 #endif /* __AMD64_H__ */
 

sys/amd64/include/pmap.h

@@ -2,7 +2,7 @@
 #ifndef __PMAP_H__
 #define __PMAP_H__
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 
 /*
  * +----------------------+

sys/amd64/include/thread.h

@@ -2,8 +2,8 @@
 #ifndef __MACHINE_THREAD_H__
 #define __MACHINE_THREAD_H__
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 typedef struct ThreadArchStackFrame {
     uint64_t		r15;

sys/amd64/ioapic.c

@@ -9,7 +9,7 @@
 #include <sys/kdebug.h>
 #include <sys/cdefs.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/pmap.h>
 #include <machine/trap.h>
 

sys/amd64/lapic.c

@@ -8,8 +8,8 @@
 #include <sys/kassert.h>
 #include <sys/kdebug.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/pmap.h>
 #include <machine/trap.h>
 

sys/amd64/machine.c

@@ -8,7 +8,7 @@
 #include <sys/irq.h>
 #include <sys/spinlock.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/ioapic.h>
 #include <machine/lapic.h>
 #include <machine/trap.h>

sys/amd64/mbentry.c

@@ -10,7 +10,7 @@
 
 #include "../dev/console.h"
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/pmap.h>
 #include <machine/multiboot.h>
 

sys/amd64/mp.c

@@ -10,8 +10,8 @@
 #include <sys/ktime.h>
 #include <sys/mp.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/pmap.h>
 #include <machine/lapic.h>
 #include <machine/mp.h>

sys/amd64/pci.c

@@ -4,8 +4,8 @@
 #include <sys/kassert.h>
 #include <sys/pci.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 #define PCI_PORT_ADDR		0xCF8
 #define PCI_PORT_DATABASE	0xCFC

sys/amd64/pmap.c

@@ -7,8 +7,8 @@
 #include <sys/kdebug.h>
 #include <sys/kmem.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/mp.h>
 #include <machine/pmap.h>
 

sys/amd64/thread.c

@@ -8,8 +8,8 @@
 #include <sys/kmem.h>
 #include <sys/mp.h>
 #include <sys/thread.h>
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/trap.h>
 #include <machine/pmap.h>
 

sys/amd64/time.c

@@ -6,8 +6,8 @@
 #include <sys/kdebug.h>
 #include <sys/ktime.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 uint64_t
 Time_GetTSC()

sys/amd64/trap.c

@@ -12,7 +12,7 @@
 #include <sys/syscall.h>
 #include <sys/mp.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/lapic.h>
 #include <machine/trap.h>
 #include <machine/mp.h>

sys/amd64/xmem.c

@@ -7,8 +7,8 @@
 #include <sys/kdebug.h>
 #include <sys/kmem.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 #include <machine/pmap.h>
 #include <machine/mp.h>
 

sys/dev/x86/debugcons.c

@@ -7,8 +7,8 @@
 
 #include <sys/cdefs.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 void DebugConsole_Init()
 {

sys/dev/x86/ps2.c

@@ -7,8 +7,8 @@
 #include <sys/kdebug.h>
 #include <sys/irq.h>
 
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 #include "../console.h"
 #include "ps2.h"

sys/dev/x86/vgacons.c

@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #include <sys/kdebug.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/pmap.h>
 
 #include "vgacons.h"

sys/kern/loader.c

@@ -14,7 +14,7 @@
 #include <sys/disk.h>
 #include <sys/elf64.h>
 
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/trap.h>
 #include <machine/pmap.h>
 #include <sys/thread.h>

sys/kern/palloc.c

@@ -16,7 +16,7 @@
 #include <sys/spinlock.h>
 
 // PGSIZE
-#include <machine/amd64.h>
+#include <machine/cpu.h>
 #include <machine/pmap.h>
 
 /* 'FREEPAGE' */

sys/kern/spinlock.c

@@ -15,8 +15,8 @@
 #include <sys/spinlock.h>
 
 #include <machine/atomic.h>
-#include <machine/amd64.h>
-#include <machine/amd64op.h>
+#include <machine/cpu.h>
+#include <machine/cpuop.h>
 
 Spinlock lockListLock = {
     0, 0, 0, 0, 0, 0, 0,