svn commit: r349035 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys

[Alexander Motin]

Author: mav
Date: Fri Jun 14 17:09:39 2019
New Revision: 349035
URL: https://svnweb.freebsd.org/changeset/base/349035

Log:
  Properly align struct multilist_sublist to cache line.
  
  Manual Illumos alignment does not fit us due to different kmutex_t size.
  
  MFC after:	1 week
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h	Fri Jun 14 15:09:08 2019	(r349034)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h	Fri Jun 14 17:09:39 2019	(r349035)
@@ -44,11 +44,10 @@ struct multilist_sublist {
 	 */
 	list_t		mls_list;
 	/*
-	 * Pad to cache line (64 bytes), in an effort to try and prevent
-	 * cache line contention.
+	 * Pad to cache line, in an effort to try and prevent cache line
+	 * contention.
 	 */
-	uint8_t		mls_pad[24];
-};
+} __aligned(CACHE_LINE_SIZE);
 
 struct multilist {
 	/*