CVS commit: [matt-nb6-plus] src/sys/kern

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Thu Dec  6 16:07:21 UTC 2012

Modified Files:
        src/sys/kern [matt-nb6-plus]: sys_generic.c

Log Message:
Make sure ioctl stkbuf has a minimal alignment of (__ALIGNBYTES+1)


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.128.4.1 src/sys/kern/sys_generic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/sys_generic.c
diff -u src/sys/kern/sys_generic.c:1.128 src/sys/kern/sys_generic.c:1.128.4.1
--- src/sys/kern/sys_generic.c:1.128	Wed Jan 25 00:28:36 2012
+++ src/sys/kern/sys_generic.c	Thu Dec  6 16:07:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_generic.c,v 1.128 2012/01/25 00:28:36 christos Exp $	*/
+/*	$NetBSD: sys_generic.c,v 1.128.4.1 2012/12/06 16:07:21 matt Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.128 2012/01/25 00:28:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.128.4.1 2012/12/06 16:07:21 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -525,7 +525,7 @@ sys_ioctl(struct lwp *l, const struct sy
 	size_t		size, alloc_size;
 	void 		*data, *memp;
 #define	STK_PARAMS	128
-	u_long		stkbuf[STK_PARAMS/sizeof(u_long)];
+	u_long		stkbuf[STK_PARAMS/sizeof(u_long)] __aligned(__ALIGNBYTES+1);
 
 	memp = NULL;
 	alloc_size = 0;