Date: Tue, 17 Nov 2020 04:22:10 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367746 - head/sys/kern Message-ID: <202011170422.0AH4MA29036242@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Tue Nov 17 04:22:10 2020 New Revision: 367746 URL: https://svnweb.freebsd.org/changeset/base/367746 Log: Fix !COMPAT_FREEBSD32 kernel build One of the last shifts inadvertently moved these static assertions out of a COMPAT_FREEBSD32 block, which the relevant definitions are limited to. Fix it. Pointy hat: kevans Modified: head/sys/kern/kern_umtx.c Modified: head/sys/kern/kern_umtx.c ============================================================================== --- head/sys/kern/kern_umtx.c Tue Nov 17 04:06:35 2020 (r367745) +++ head/sys/kern/kern_umtx.c Tue Nov 17 04:22:10 2020 (r367746) @@ -219,9 +219,11 @@ struct abs_timeout { struct timespec end; }; +#ifdef COMPAT_FREEBSD32 _Static_assert(sizeof(struct umutex) == sizeof(struct umutex32), "umutex32"); _Static_assert(__offsetof(struct umutex, m_spare[0]) == __offsetof(struct umutex32, m_spare[0]), "m_spare32"); +#endif int umtx_shm_vnobj_persistent = 0; SYSCTL_INT(_kern_ipc, OID_AUTO, umtx_vnode_persistent, CTLFLAG_RWTUN,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011170422.0AH4MA29036242>