Module Name: src
Committed By: martin
Date: Sun Sep 15 13:03:59 UTC 2013
Modified Files:
src/sys/kern: kern_descrip.c kern_synch.c
src/sys/nfs: nfs_export.c
Log Message:
Remove __CT_LOCAL_.. hack
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sys/kern/kern_descrip.c
cvs rdiff -u -r1.306 -r1.307 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.55 -r1.56 src/sys/nfs/nfs_export.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.221 src/sys/kern/kern_descrip.c:1.222
--- src/sys/kern/kern_descrip.c:1.221 Sat Sep 14 13:46:52 2013
+++ src/sys/kern/kern_descrip.c Sun Sep 15 13:03:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.221 2013/09/14 13:46:52 martin Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.222 2013/09/15 13:03:59 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.221 2013/09/14 13:46:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.222 2013/09/15 13:03:59 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1323,9 +1323,7 @@ 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);
Index: src/sys/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.306 src/sys/kern/kern_synch.c:1.307
--- src/sys/kern/kern_synch.c:1.306 Sat Sep 14 20:49:31 2013
+++ src/sys/kern/kern_synch.c Sun Sep 15 13:03:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.306 2013/09/14 20:49:31 martin Exp $ */
+/* $NetBSD: kern_synch.c,v 1.307 2013/09/15 13:03:59 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.306 2013/09/14 20:49:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.307 2013/09/15 13:03:59 martin Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -1223,9 +1223,7 @@ sched_pstats(void)
/* Load average calculation. */
if (__predict_false(lavg_count == 0)) {
int i;
- __CT_LOCAL_PROLOGUE
CTASSERT(__arraycount(cexp) == __arraycount(avg->ldavg));
- __CT_LOCAL_EPILOGUE
for (i = 0; i < __arraycount(cexp); i++) {
avg->ldavg[i] = (cexp[i] * avg->ldavg[i] +
nrun * FSCALE * (FSCALE - cexp[i])) >> FSHIFT;
Index: src/sys/nfs/nfs_export.c
diff -u src/sys/nfs/nfs_export.c:1.55 src/sys/nfs/nfs_export.c:1.56
--- src/sys/nfs/nfs_export.c:1.55 Sat Sep 14 21:11:45 2013
+++ src/sys/nfs/nfs_export.c Sun Sep 15 13:03:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_export.c,v 1.55 2013/09/14 21:11:45 martin Exp $ */
+/* $NetBSD: nfs_export.c,v 1.56 2013/09/15 13:03:59 martin Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_export.c,v 1.55 2013/09/14 21:11:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_export.c,v 1.56 2013/09/15 13:03:59 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -449,9 +449,7 @@ nfs_export_update_30(struct mount *mp, c
* The following code assumes export_args has not
* changed since export_args30, so check that.
*/
- __CT_LOCAL_PROLOGUE
__CTASSERT(sizeof(args->eargs) == sizeof(*mel.mel_exports));
- __CT_LOCAL_EPILOGUE
mel.mel_nexports = 1;
mel.mel_exports = (void *)&args->eargs;
