diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index 16c30adc6700..842e8bb04b19 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -93,9 +93,7 @@
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
  * architecture.  It should be used with appropriate caution.
  */
-#ifndef CACHE_LINE_SHIFT
 #define	CACHE_LINE_SHIFT	6
-#endif
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 /* Size of the level 1 page table units */
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index 4a83e2721f30..802390bc8f7c 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -85,9 +85,7 @@
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
  * architecture.  It should be used with appropriate caution.
  */
-#ifndef CACHE_LINE_SHIFT
 #define	CACHE_LINE_SHIFT	6
-#endif
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 #define	PAGE_SHIFT	12
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index abf855d06620..3c22c7c4ca23 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -78,9 +78,7 @@
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
  * architecture.  It should be used with appropriate caution.
  */
-#ifndef CACHE_LINE_SHIFT
 #define	CACHE_LINE_SHIFT	6
-#endif
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 #define PAGE_SHIFT	12		/* LOG2(PAGE_SIZE) */
diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h
index 4130ec475321..f59c40883b79 100644
--- a/sys/ia64/include/param.h
+++ b/sys/ia64/include/param.h
@@ -103,9 +103,7 @@
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
  * architecture.  It should be used with appropriate caution.
  */
-#ifndef CACHE_LINE_SHIFT
-#define	CACHE_LINE_SHIFT	6
-#endif
+#define	CACHE_LINE_SHIFT	7
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 #ifndef LOG2_PAGE_SIZE
diff --git a/sys/mips/include/param.h b/sys/mips/include/param.h
index af1e06fad3e1..ea599d11f5e9 100644
--- a/sys/mips/include/param.h
+++ b/sys/mips/include/param.h
@@ -93,9 +93,7 @@
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
  * architecture.  It should be used with appropriate caution.
  */
-#ifndef CACHE_LINE_SHIFT
 #define	CACHE_LINE_SHIFT	6
-#endif
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 #define	NBPG		4096		/* bytes/page */
diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h
index cab873efc1c3..a9142c6df14b 100644
--- a/sys/powerpc/include/param.h
+++ b/sys/powerpc/include/param.h
@@ -83,9 +83,7 @@
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
  * architecture.  It should be used with appropriate caution.
  */
-#ifndef CACHE_LINE_SHIFT
 #define	CACHE_LINE_SHIFT	7
-#endif
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 #define	PAGE_SHIFT	12
diff --git a/sys/sparc64/include/param.h b/sys/sparc64/include/param.h
index b90997176d42..f09a6cda5030 100644
--- a/sys/sparc64/include/param.h
+++ b/sys/sparc64/include/param.h
@@ -75,9 +75,7 @@
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
  * architecture.  It should be used with appropriate caution.
  */
-#ifndef CACHE_LINE_SHIFT
-#define	CACHE_LINE_SHIFT	6
-#endif
+#define	CACHE_LINE_SHIFT	7
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 #define	PAGE_SHIFT_8K	13
diff --git a/sys/sun4v/include/param.h b/sys/sun4v/include/param.h
index aca3c375e3c9..e42abf50c978 100644
--- a/sys/sun4v/include/param.h
+++ b/sys/sun4v/include/param.h
@@ -75,9 +75,7 @@
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
  * architecture.  It should be used with appropriate caution.
  */
-#ifndef CACHE_LINE_SHIFT
-#define	CACHE_LINE_SHIFT	6
-#endif
+#define	CACHE_LINE_SHIFT	7
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 #define	PAGE_SHIFT_8K	13