x86_64: kernel: do *not* include machine/param.h

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/include/arch/x86/barrelfish_kpi/asm_inlines_arch.h b/include/arch/x86/barrelfish_kpi/asm_inlines_arch.h
index c7b19d8..36f6c9d 100644 (file)
--- a/include/arch/x86/barrelfish_kpi/asm_inlines_arch.h
+++ b/include/arch/x86/barrelfish_kpi/asm_inlines_arch.h
@@ -17,8 +17,6 @@
 
 #ifndef __ASSEMBLER__
 
-#include <machine/param.h>
-
 /** \brief This code reads the cycle counter */
 static inline uint64_t rdtsc(void)
 {
@@ -76,7 +74,9 @@ static inline void clflush(void *line)
     __asm volatile("clflush %0" :: "m" (line));
 }
 
-//#define CACHE_LINE_SIZE 64 /* bytes */
+#ifndef CACHE_LINE_SIZE
+#define CACHE_LINE_SIZE 64 /* bytes */
+#endif
 
 #ifndef __cplusplus
 /* flush a range of memory from the cache */

diff --git a/kernel/arch/x86/apic.c b/kernel/arch/x86/apic.c
index 15ee562..300ea90 100644 (file)
--- a/kernel/arch/x86/apic.c
+++ b/kernel/arch/x86/apic.c
@@ -18,7 +18,6 @@
 #include <arch/x86/start_aps.h>
 #include <paging_kernel_arch.h>
 #include <x86.h>
-#include <sys/param.h>
 
 #include <dev/ia32_dev.h>
 #include <dev/xapic_dev.h>