Module Name: src
Committed By: martin
Date: Sat Sep 14 13:46:52 UTC 2013
Modified Files:
src/sys/kern: kern_descrip.c
Log Message:
Avoid warnings for a local CTASSERT
To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 src/sys/kern/kern_descrip.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/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.220 src/sys/kern/kern_descrip.c:1.221
--- src/sys/kern/kern_descrip.c:1.220 Thu Sep 5 12:23:07 2013
+++ src/sys/kern/kern_descrip.c Sat Sep 14 13:46:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.220 2013/09/05 12:23:07 pooka Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.221 2013/09/14 13:46:52 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.220 2013/09/05 12:23:07 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.221 2013/09/14 13:46:52 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1323,7 +1323,9 @@ filedesc_ctor(void *arg, void *obj, int
fdp->fd_himap = fdp->fd_dhimap;
fdp->fd_lomap = fdp->fd_dlomap;
+ __CT_LOCAL_PROLOGUE
CTASSERT(sizeof(fdp->fd_dfdfile[0]) >= sizeof(fdfile_t));
+ __CT_LOCAL_EPILOGUE
for (i = 0, ffp = fdp->fd_dt->dt_ff; i < NDFDFILE; i++, ffp++) {
*ffp = (fdfile_t *)fdp->fd_dfdfile[i];
(void)fdfile_ctor(NULL, fdp->fd_dfdfile[i], PR_WAITOK);
