diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-12-19 19:54:47 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-12-19 19:54:47 +0000 |
| commit | 103b9230f38b37e9602ba0eca20b71cf9015350f (patch) | |
| tree | 7543b10f46bb4f2be3520b6cff274227426bae99 | |
| parent | 982cfcb5740407f427a8de0b03cd465ebd0c6337 (diff) | |
Since we have an ioctl that uses a struct with an off_t member as its
argument, we need to make sure this buffer has 64-bit alignment, even
on 32-bit architectures. Fixes the alignment trap triggered by
vnconfig(8) on sparc for kernels compiled with gcc4.
ok miod@
| -rw-r--r-- | sys/kern/sys_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index be71bc2184b..b7d741060f5 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_generic.c,v 1.71 2010/08/18 17:42:12 marco Exp $ */ +/* $OpenBSD: sys_generic.c,v 1.72 2010/12/19 19:54:46 kettenis Exp $ */ /* $NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $ */ /* @@ -395,7 +395,7 @@ sys_ioctl(struct proc *p, void *v, register_t *retval) caddr_t data, memp; int tmp; #define STK_PARAMS 128 - u_long stkbuf[STK_PARAMS / sizeof(u_long)]; + long long stkbuf[STK_PARAMS / sizeof(long long)]; fdp = p->p_fd; if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL) |