d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix !COMPAT_FREEBSD32 kernel build

Browse Source 
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
This commit is contained in:
Kyle Evans 2020-11-17 04:22:10 +00:00
parent 7d4dfe7790
commit bd4bcd14e3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=367746
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/kern_umtx.c
View File

@ -219,9 +219,11 @@ struct abs_timeout {
struct timespec end; struct timespec end;
}; };
#ifdef COMPAT_FREEBSD32
_Static_assert(sizeof(struct umutex) == sizeof(struct umutex32), "umutex32"); _Static_assert(sizeof(struct umutex) == sizeof(struct umutex32), "umutex32");
_Static_assert(__offsetof(struct umutex, m_spare[0]) == _Static_assert(__offsetof(struct umutex, m_spare[0]) ==
__offsetof(struct umutex32, m_spare[0]), "m_spare32"); __offsetof(struct umutex32, m_spare[0]), "m_spare32");
#endif
int umtx_shm_vnobj_persistent = 0; int umtx_shm_vnobj_persistent = 0;
SYSCTL_INT(_kern_ipc, OID_AUTO, umtx_vnode_persistent, CTLFLAG_RWTUN, SYSCTL_INT(_kern_ipc, OID_AUTO, umtx_vnode_persistent, CTLFLAG_RWTUN,