diff options
| author |   kettenis <kettenis@openbsd.org> | 2017-05-16 15:57:03 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2017-05-16 15:57:03 +0000 |
| commit | c2560ea7be965c7f34048beba6d2d9d14e798ff3 (patch) | |
| tree | 42ddeea9e06bacead5f2a34720cb1961c3fd75a1 | |
| parent | use _mtx_init instead of __mtx_init inside mtx_init on !WITNESS kernels (diff) | |
| download | wireguard-openbsd-c2560ea7be965c7f34048beba6d2d9d14e798ff3.tar.xz wireguard-openbsd-c2560ea7be965c7f34048beba6d2d9d14e798ff3.zip | |
Using __aligned(8) to tag 'struct m_hdr' triggers warnings on landisk:
/usr/src/sys/dev/ic/re.c:1602: warning: ignoring alignment for stack allocated 'mh'
So instead add explicit padding on ILP32 systems.
ok deraadt@, mikeb@
| -rw-r--r-- | sys/sys/mbuf.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 06e95d8bce2..6eb5dedf302 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.227 2017/05/10 21:41:27 kettenis Exp $ */ +/* $OpenBSD: mbuf.h,v 1.228 2017/05/16 15:57:03 kettenis Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -86,7 +86,10 @@ struct m_hdr { u_int mh_len; /* amount of data in this mbuf */ short mh_type; /* type of data in this mbuf */ u_short mh_flags; /* flags; see below */ -} __aligned(8); +#ifndef __LP64__ + u_int mh_pad; /* pad to 8-byte boundary */ +#endif +}; /* pf stuff */ struct pf_state_key; |