[src/trunk]: src/sys Remove __CT_LOCAL_.. hack

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9692da8ec56
branches:  trunk
changeset: 790038:b9692da8ec56
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 15 13:03:59 2013 +0000

description:
Remove __CT_LOCAL_.. hack

diffstat:

 sys/kern/kern_descrip.c |  6 ++----
 sys/kern/kern_synch.c   |  6 ++----
 sys/nfs/nfs_export.c    |  6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diffs (84 lines):

diff -r d0efbdff82d3 -r b9692da8ec56 sys/kern/kern_descrip.c
--- a/sys/kern/kern_descrip.c   Sun Sep 15 13:01:37 2013 +0000
+++ b/sys/kern/kern_descrip.c   Sun Sep 15 13:03:59 2013 +0000
@@ -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 @@
        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);
diff -r d0efbdff82d3 -r b9692da8ec56 sys/kern/kern_synch.c
--- a/sys/kern/kern_synch.c     Sun Sep 15 13:01:37 2013 +0000
+++ b/sys/kern/kern_synch.c     Sun Sep 15 13:03:59 2013 +0000
@@ -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 @@
        /* 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;
diff -r d0efbdff82d3 -r b9692da8ec56 sys/nfs/nfs_export.c
--- a/sys/nfs/nfs_export.c      Sun Sep 15 13:01:37 2013 +0000
+++ b/sys/nfs/nfs_export.c      Sun Sep 15 13:03:59 2013 +0000
@@ -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 @@
                 * 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;