Index: sys/sparc64/include/param.h
===================================================================
--- sys/sparc64/include/param.h	(revisione 242419)
+++ sys/sparc64/include/param.h	(copia locale)
@@ -77,6 +77,12 @@
 #define	CACHE_LINE_SHIFT	7
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
+/* 
+ * CACHE_LINE_SIZE_LOCKS is the compile-time alignment and padding value
+ * for pad-aligned locks.    
+ */
+#define	CACHE_LINE_SIZE_LOCKS	(1)
+
 #define	PAGE_SHIFT_8K	13
 #define	PAGE_SIZE_8K	(1L<<PAGE_SHIFT_8K)
 #define	PAGE_MASK_8K	(PAGE_SIZE_8K-1)
Index: sys/ia64/include/param.h
===================================================================
--- sys/ia64/include/param.h	(revisione 242419)
+++ sys/ia64/include/param.h	(copia locale)
@@ -86,6 +86,12 @@
 #define	CACHE_LINE_SHIFT	7
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
+/* 
+ * CACHE_LINE_SIZE_LOCKS is the compile-time alignment and padding value
+ * for pad-aligned locks.    
+ */
+#define	CACHE_LINE_SIZE_LOCKS	CACHE_LINE_SIZE
+
 #ifndef LOG2_PAGE_SIZE
 #define	LOG2_PAGE_SIZE		13		/* 8K pages by default. */
 #endif
Index: sys/i386/include/param.h
===================================================================
--- sys/i386/include/param.h	(revisione 242419)
+++ sys/i386/include/param.h	(copia locale)
@@ -92,6 +92,12 @@
 #define	CACHE_LINE_SHIFT	7
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
+/* 
+ * CACHE_LINE_SIZE_LOCKS is the compile-time alignment and padding value
+ * for pad-aligned locks.    
+ */
+#define	CACHE_LINE_SIZE_LOCKS	CACHE_LINE_SIZE
+
 #define PAGE_SHIFT	12		/* LOG2(PAGE_SIZE) */
 #define PAGE_SIZE	(1<<PAGE_SHIFT)	/* bytes/page */
 #define PAGE_MASK	(PAGE_SIZE-1)
Index: sys/amd64/include/param.h
===================================================================
--- sys/amd64/include/param.h	(revisione 242419)
+++ sys/amd64/include/param.h	(copia locale)
@@ -88,6 +88,12 @@
 #define	CACHE_LINE_SHIFT	7
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
+/*
+ * CACHE_LINE_SIZE_LOCKS is the compile-time alignment and padding value
+ * for pad-aligned locks.
+ */
+#define	CACHE_LINE_SIZE_LOCKS	CACHE_LINE_SIZE
+
 /* Size of the level 1 page table units */
 #define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
 #define	NPTEPGSHIFT	9		/* LOG2(NPTEPG) */
Index: sys/sys/_mutex.h
===================================================================
--- sys/sys/_mutex.h	(revisione 242419)
+++ sys/sys/_mutex.h	(copia locale)
@@ -59,6 +59,6 @@ struct mtx {
 struct mtx_padalign {
 	struct lock_object	lock_object;	/* Common lock properties. */
 	volatile uintptr_t	mtx_lock;	/* Owner and flags. */
-} __aligned(CACHE_LINE_SIZE);
+} __aligned(CACHE_LINE_SIZE_LOCKS);
 
 #endif /* !_SYS__MUTEX_H_ */
Index: sys/powerpc/include/param.h
===================================================================
--- sys/powerpc/include/param.h	(revisione 242419)
+++ sys/powerpc/include/param.h	(copia locale)
@@ -92,6 +92,12 @@
 #define	CACHE_LINE_SHIFT	7
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
+/* 
+ * CACHE_LINE_SIZE_LOCKS is the compile-time alignment and padding value
+ * for pad-aligned locks.    
+ */
+#define	CACHE_LINE_SIZE_LOCKS	(1)
+
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1L << PAGE_SHIFT)	/* Page size */
 #define	PAGE_MASK	(vm_offset_t)(PAGE_SIZE - 1)
Index: sys/arm/include/param.h
===================================================================
--- sys/arm/include/param.h	(revisione 242419)
+++ sys/arm/include/param.h	(copia locale)
@@ -97,6 +97,12 @@
 #define	CACHE_LINE_SHIFT	6
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
+/* 
+ * CACHE_LINE_SIZE_LOCKS is the compile-time alignment and padding value
+ * for pad-aligned locks.    
+ */
+#define	CACHE_LINE_SIZE_LOCKS	(1)
+
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)	/* Page size */
 #define	PAGE_MASK	(PAGE_SIZE - 1)
Index: sys/mips/include/param.h
===================================================================
--- sys/mips/include/param.h	(revisione 242419)
+++ sys/mips/include/param.h	(copia locale)
@@ -124,6 +124,12 @@
 #define	CACHE_LINE_SHIFT	6
 #define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
+/* 
+ * CACHE_LINE_SIZE_LOCKS is the compile-time alignment and padding value
+ * for pad-aligned locks.    
+ */
+#define	CACHE_LINE_SIZE_LOCKS	(1)
+
 #define	PAGE_SHIFT		12		/* LOG2(PAGE_SIZE) */
 #define	PAGE_SIZE		(1<<PAGE_SHIFT) /* bytes/page */
 #define	PAGE_MASK		(PAGE_SIZE-1)