svn commit: r349820 - stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys

[Alexander Motin]

Author: mav
Date: Sun Jul  7 18:39:32 2019
New Revision: 349820
URL: https://svnweb.freebsd.org/changeset/base/349820

Log:
  MFC r349035: Properly align struct multilist_sublist to cache line.
  
  Manual Illumos alignment does not fit us due to different kmutex_t size.

Modified:
  stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h
==============================================================================
--- stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h	Sun Jul  7 18:38:40 2019	(r349819)
+++ stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h	Sun Jul  7 18:39:32 2019	(r349820)
@@ -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 {
 	/*