Move the CPU_L1_SIZE macro to x86/cpu module

10 files changed, 12 insertions, 14 deletions

diff --git a/arch/x86/machine/cpu.h b/arch/x86/machine/cpu.h
index 6e0f19aa..44d339cf 100644
--- a/arch/x86/machine/cpu.h
+++ b/arch/x86/machine/cpu.h
@@ -19,6 +19,13 @@
 #define _X86_CPU_H
 
 /*
+ * L1 cache line size.
+ *
+ * XXX Use this value until processor selection is available.
+ */
+#define CPU_L1_SIZE 64
+
+/*
  * Processor privilege levels.
  */
 #define CPU_PL_KERNEL   0
diff --git a/arch/x86/machine/param.h b/arch/x86/machine/param.h
index d8f0fc3b..f8fe2c47 100644
--- a/arch/x86/machine/param.h
+++ b/arch/x86/machine/param.h
@@ -25,13 +25,6 @@
 #include <kern/macros.h>
 
 /*
- * L1 cache line size.
- *
- * XXX Use this value until processor selection is available.
- */
-#define CPU_L1_SIZE 64
-
-/*
  * Code/data alignment.
  */
 #define TEXT_ALIGN  16
diff --git a/arch/x86/x15.lds.S b/arch/x86/x15.lds.S
index 3fc57cad..bc7f480e 100644
--- a/arch/x86/x15.lds.S
+++ b/arch/x86/x15.lds.S
@@ -9,6 +9,7 @@ OUTPUT_ARCH(i386)
 ENTRY(_start)
 
 #include <machine/boot.h>
+#include <machine/cpu.h>
 #include <machine/param.h>
 
 PHDRS
diff --git a/kern/kmem_i.h b/kern/kmem_i.h
index 28dccd14..d4671e24 100644
--- a/kern/kmem_i.h
+++ b/kern/kmem_i.h
@@ -22,7 +22,7 @@
 
 #include <kern/list.h>
 #include <kern/mutex.h>
-#include <kern/param.h>
+#include <machine/cpu.h>
 
 /*
  * Per-processor cache of pre-constructed objects.
diff --git a/kern/llsync_i.h b/kern/llsync_i.h
index 12e2861c..dd5a6179 100644
--- a/kern/llsync_i.h
+++ b/kern/llsync_i.h
@@ -22,7 +22,6 @@
 
 #include <kern/cpumap.h>
 #include <kern/macros.h>
-#include <kern/param.h>
 #include <kern/spinlock.h>
 #include <kern/syscnt.h>
 #include <kern/work.h>
diff --git a/kern/sleepq.c b/kern/sleepq.c
index f5fa6729..f7c3245b 100644
--- a/kern/sleepq.c
+++ b/kern/sleepq.c
@@ -27,10 +27,10 @@
 #include <kern/kmem.h>
 #include <kern/list.h>
 #include <kern/macros.h>
-#include <kern/param.h>
 #include <kern/sleepq.h>
 #include <kern/spinlock.h>
 #include <kern/thread.h>
+#include <machine/cpu.h>
 
 struct sleepq_bucket {
     struct spinlock lock;
diff --git a/kern/thread_i.h b/kern/thread_i.h
index 9c8d4fdf..b7d3de17 100644
--- a/kern/thread_i.h
+++ b/kern/thread_i.h
@@ -26,8 +26,8 @@
 #include <kern/list_types.h>
 #include <kern/macros.h>
 #include <kern/mutex_types.h>
-#include <kern/param.h>
 #include <kern/turnstile_types.h>
+#include <machine/cpu.h>
 #include <machine/tcb.h>
 
 /*
diff --git a/kern/turnstile.c b/kern/turnstile.c
index 78532fb5..97416ae9 100644
--- a/kern/turnstile.c
+++ b/kern/turnstile.c
@@ -52,12 +52,12 @@
 #include <kern/kmem.h>
 #include <kern/list.h>
 #include <kern/macros.h>
-#include <kern/param.h>
 #include <kern/plist.h>
 #include <kern/spinlock.h>
 #include <kern/thread.h>
 #include <kern/turnstile.h>
 #include <kern/turnstile_types.h>
+#include <machine/cpu.h>
 
 /*
  * Locking keys :
diff --git a/kern/work.c b/kern/work.c
index 284b1e28..9925c198 100644
--- a/kern/work.c
+++ b/kern/work.c
@@ -26,7 +26,6 @@
 #include <kern/log.h>
 #include <kern/macros.h>
 #include <kern/panic.h>
-#include <kern/param.h>
 #include <kern/percpu.h>
 #include <kern/spinlock.h>
 #include <kern/syscnt.h>
diff --git a/kern/xcall.c b/kern/xcall.c
index ce22aa0f..1c052ac4 100644
--- a/kern/xcall.c
+++ b/kern/xcall.c
@@ -20,7 +20,6 @@
 
 #include <kern/atomic.h>
 #include <kern/macros.h>
-#include <kern/param.h>
 #include <kern/percpu.h>
 #include <kern/spinlock.h>
 #include <kern/thread.h>