svn commit: r354420 - head/sys/sys

[Brooks Davis]

Author: brooks
Date: Thu Nov  7 00:07:54 2019
New Revision: 354420
URL: https://svnweb.freebsd.org/changeset/base/354420

Log:
  Fix the alignment of struct xunpcb on systems with >64-bit pointers.
  
  Reviewed by:	emaste
  Obtained from:	CheriBSD
  MFC after:	3 days
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D22268

Modified:
  head/sys/sys/unpcb.h

Modified: head/sys/sys/unpcb.h
==============================================================================
--- head/sys/sys/unpcb.h	Wed Nov  6 23:45:43 2019	(r354419)
+++ head/sys/sys/unpcb.h	Thu Nov  7 00:07:54 2019	(r354420)
@@ -156,7 +156,7 @@ struct xunpcb {
 		char	xu_dummy2[256];
 	};
 	struct xsocket	xu_socket;
-} __aligned(8);
+} __aligned(MAX(8, sizeof(void *)));
 
 struct xunpgen {
 	ksize_t	xug_len;