Module Name: src
Committed By: pgoyette
Date: Tue Jul 26 05:54:40 UTC 2016
Modified Files:
src/sys/dev [pgoyette-localcount]: audio.c cgd.c fss.c ld.c md.c
rndpseudo.c vnd.c
src/sys/dev/dm [pgoyette-localcount]: device-mapper.c
src/sys/dev/pad [pgoyette-localcount]: pad.c
src/sys/dev/pci [pgoyette-localcount]: pci_usrreq.c
src/sys/dev/pud [pgoyette-localcount]: pud_dev.c
src/sys/dev/putter [pgoyette-localcount]: putter.c
src/sys/dev/raidframe [pgoyette-localcount]: rf_netbsdkintf.c
src/sys/dev/scsipi [pgoyette-localcount]: cd.c sd.c
src/sys/dev/sysmon [pgoyette-localcount]: sysmon.c
src/sys/dev/usb [pgoyette-localcount]: ucom.c ulpt.c
src/sys/dev/wscons [pgoyette-localcount]: wskbd.c wsmouse.c
src/sys/external/bsd/ipf/netinet [pgoyette-localcount]: ip_fil_netbsd.c
src/sys/kern [pgoyette-localcount]: kern_drvctl.c tty_ptm.c tty_pty.c
tty_tty.c
src/sys/net [pgoyette-localcount]: bpf.c if_tap.c
src/sys/net/npf [pgoyette-localcount]: npf.c
src/sys/netsmb [pgoyette-localcount]: smb_dev.c
src/sys/opencrypto [pgoyette-localcount]: cryptodev.c
src/sys/rump/librump/rumpvfs [pgoyette-localcount]: devnull.c rumpblk.c
src/sys/sys [pgoyette-localcount]: localcount.h
Log Message:
Rename LOCALCOUNT_INITIALIZER to DEVSW_MODULE_INIT. This better describes
what we're doing, and why.
To generate a diff of this commit:
cvs rdiff -u -r1.268.2.4 -r1.268.2.5 src/sys/dev/audio.c
cvs rdiff -u -r1.108.2.15 -r1.108.2.16 src/sys/dev/cgd.c
cvs rdiff -u -r1.93.2.2 -r1.93.2.3 src/sys/dev/fss.c
cvs rdiff -u -r1.94.2.2 -r1.94.2.3 src/sys/dev/ld.c
cvs rdiff -u -r1.76.2.2 -r1.76.2.3 src/sys/dev/md.c
cvs rdiff -u -r1.35.2.2 -r1.35.2.3 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.256.2.6 -r1.256.2.7 src/sys/dev/vnd.c
cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.25.2.3 -r1.25.2.4 src/sys/dev/pad/pad.c
cvs rdiff -u -r1.29.2.2 -r1.29.2.3 src/sys/dev/pci/pci_usrreq.c
cvs rdiff -u -r1.7.2.3 -r1.7.2.4 src/sys/dev/pud/pud_dev.c
cvs rdiff -u -r1.35.8.2 -r1.35.8.3 src/sys/dev/putter/putter.c
cvs rdiff -u -r1.345.2.5 -r1.345.2.6 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.331.2.2 -r1.331.2.3 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.317.2.2 -r1.317.2.3 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.28.2.2 -r1.28.2.3 src/sys/dev/sysmon/sysmon.c
cvs rdiff -u -r1.113.2.2 -r1.113.2.3 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.97.2.2 -r1.97.2.3 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.136.2.2 -r1.136.2.3 src/sys/dev/wscons/wskbd.c
cvs rdiff -u -r1.66.8.2 -r1.66.8.3 src/sys/dev/wscons/wsmouse.c
cvs rdiff -u -r1.16.2.3 -r1.16.2.4 \
src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.41.2.2 -r1.41.2.3 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.37.2.2 -r1.37.2.3 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.142.2.3 -r1.142.2.4 src/sys/kern/tty_pty.c
cvs rdiff -u -r1.40.8.2 -r1.40.8.3 src/sys/kern/tty_tty.c
cvs rdiff -u -r1.199.2.2 -r1.199.2.3 src/sys/net/bpf.c
cvs rdiff -u -r1.84.2.2 -r1.84.2.3 src/sys/net/if_tap.c
cvs rdiff -u -r1.31.2.2 -r1.31.2.3 src/sys/net/npf/npf.c
cvs rdiff -u -r1.44.2.3 -r1.44.2.4 src/sys/netsmb/smb_dev.c
cvs rdiff -u -r1.85.2.2 -r1.85.2.3 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/sys/rump/librump/rumpvfs/devnull.c
cvs rdiff -u -r1.64.2.2 -r1.64.2.3 src/sys/rump/librump/rumpvfs/rumpblk.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/sys/localcount.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.268.2.4 src/sys/dev/audio.c:1.268.2.5
--- src/sys/dev/audio.c:1.268.2.4 Tue Jul 26 03:52:14 2016
+++ src/sys/dev/audio.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.268.2.4 2016/07/26 03:52:14 pgoyette Exp $ */
+/* $NetBSD: audio.c,v 1.268.2.5 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.268.2.4 2016/07/26 03:52:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.268.2.5 2016/07/26 05:54:39 pgoyette Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -348,7 +348,7 @@ dev_type_mmap(audiommap);
dev_type_kqfilter(audiokqfilter);
const struct cdevsw audio_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = audioopen,
.d_close = audioclose,
.d_read = audioread,
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.108.2.15 src/sys/dev/cgd.c:1.108.2.16
--- src/sys/dev/cgd.c:1.108.2.15 Tue Jul 26 03:24:20 2016
+++ src/sys/dev/cgd.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.108.2.15 2016/07/26 03:24:20 pgoyette Exp $ */
+/* $NetBSD: cgd.c,v 1.108.2.16 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.108.2.15 2016/07/26 03:24:20 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.108.2.16 2016/07/26 05:54:39 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -72,7 +72,7 @@ static dev_type_dump(cgddump);
static dev_type_size(cgdsize);
const struct bdevsw cgd_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = cgdopen,
.d_close = cgdclose,
.d_strategy = cgdstrategy,
@@ -84,7 +84,7 @@ const struct bdevsw cgd_bdevsw = {
};
const struct cdevsw cgd_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = cgdopen,
.d_close = cgdclose,
.d_read = cgdread,
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.93.2.2 src/sys/dev/fss.c:1.93.2.3
--- src/sys/dev/fss.c:1.93.2.2 Tue Jul 19 06:26:58 2016
+++ src/sys/dev/fss.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.93.2.2 2016/07/19 06:26:58 pgoyette Exp $ */
+/* $NetBSD: fss.c,v 1.93.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.93.2.2 2016/07/19 06:26:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.93.2.3 2016/07/26 05:54:39 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ static struct vfs_hooks fss_vfs_hooks =
};
const struct bdevsw fss_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = fss_open,
.d_close = fss_close,
.d_strategy = fss_strategy,
@@ -112,7 +112,7 @@ const struct bdevsw fss_bdevsw = {
};
const struct cdevsw fss_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = fss_open,
.d_close = fss_close,
.d_read = fss_read,
Index: src/sys/dev/ld.c
diff -u src/sys/dev/ld.c:1.94.2.2 src/sys/dev/ld.c:1.94.2.3
--- src/sys/dev/ld.c:1.94.2.2 Tue Jul 19 06:26:58 2016
+++ src/sys/dev/ld.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.94.2.2 2016/07/19 06:26:58 pgoyette Exp $ */
+/* $NetBSD: ld.c,v 1.94.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.94.2.2 2016/07/19 06:26:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.94.2.3 2016/07/26 05:54:39 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@ static dev_type_size(ldsize);
static dev_type_discard(lddiscard);
const struct bdevsw ld_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = ldopen,
.d_close = ldclose,
.d_strategy = ldstrategy,
@@ -97,7 +97,7 @@ const struct bdevsw ld_bdevsw = {
};
const struct cdevsw ld_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = ldopen,
.d_close = ldclose,
.d_read = ldread,
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.76.2.2 src/sys/dev/md.c:1.76.2.3
--- src/sys/dev/md.c:1.76.2.2 Tue Jul 19 06:26:58 2016
+++ src/sys/dev/md.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.76.2.2 2016/07/19 06:26:58 pgoyette Exp $ */
+/* $NetBSD: md.c,v 1.76.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.76.2.2 2016/07/19 06:26:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.76.2.3 2016/07/26 05:54:39 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -107,7 +107,7 @@ static dev_type_strategy(mdstrategy);
static dev_type_size(mdsize);
const struct bdevsw md_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = mdopen,
.d_close = mdclose,
.d_strategy = mdstrategy,
@@ -119,7 +119,7 @@ const struct bdevsw md_bdevsw = {
};
const struct cdevsw md_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = mdopen,
.d_close = mdclose,
.d_read = mdread,
Index: src/sys/dev/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.35.2.2 src/sys/dev/rndpseudo.c:1.35.2.3
--- src/sys/dev/rndpseudo.c:1.35.2.2 Tue Jul 19 06:26:58 2016
+++ src/sys/dev/rndpseudo.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.35.2.2 2016/07/19 06:26:58 pgoyette Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.35.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.35.2.2 2016/07/19 06:26:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.35.2.3 2016/07/26 05:54:39 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -111,7 +111,7 @@ static percpu_t *percpu_urandom_cprng __
dev_type_open(rndopen);
const struct cdevsw rnd_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = rndopen,
.d_close = noclose,
.d_read = noread,
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.256.2.6 src/sys/dev/vnd.c:1.256.2.7
--- src/sys/dev/vnd.c:1.256.2.6 Tue Jul 26 04:30:50 2016
+++ src/sys/dev/vnd.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.256.2.6 2016/07/26 04:30:50 pgoyette Exp $ */
+/* $NetBSD: vnd.c,v 1.256.2.7 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.6 2016/07/26 04:30:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.7 2016/07/26 05:54:39 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -199,7 +199,7 @@ static dev_type_dump(vnddump);
static dev_type_size(vndsize);
const struct bdevsw vnd_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = vndopen,
.d_close = vndclose,
.d_strategy = vndstrategy,
@@ -211,7 +211,7 @@ const struct bdevsw vnd_bdevsw = {
};
const struct cdevsw vnd_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = vndopen,
.d_close = vndclose,
.d_read = vndread,
Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.38.2.2 src/sys/dev/dm/device-mapper.c:1.38.2.3
--- src/sys/dev/dm/device-mapper.c:1.38.2.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/dm/device-mapper.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.38.2.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: device-mapper.c,v 1.38.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@ static int dm_match(device_t, cfdata_t,
/* ***Variable-definitions*** */
const struct bdevsw dm_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = dmopen,
.d_close = dmclose,
.d_strategy = dmstrategy,
@@ -92,7 +92,7 @@ const struct bdevsw dm_bdevsw = {
};
const struct cdevsw dm_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = dmopen,
.d_close = dmclose,
.d_read = dmread,
Index: src/sys/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.25.2.3 src/sys/dev/pad/pad.c:1.25.2.4
--- src/sys/dev/pad/pad.c:1.25.2.3 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/pad/pad.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.25.2.3 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: pad.c,v 1.25.2.4 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.25.2.3 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.25.2.4 2016/07/26 05:54:39 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -131,7 +131,7 @@ dev_type_close(pad_close);
dev_type_read(pad_read);
const struct cdevsw pad_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = pad_open,
.d_close = pad_close,
.d_read = pad_read,
Index: src/sys/dev/pci/pci_usrreq.c
diff -u src/sys/dev/pci/pci_usrreq.c:1.29.2.2 src/sys/dev/pci/pci_usrreq.c:1.29.2.3
--- src/sys/dev/pci/pci_usrreq.c:1.29.2.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/pci/pci_usrreq.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_usrreq.c,v 1.29.2.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: pci_usrreq.c,v 1.29.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.29.2.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.29.2.3 2016/07/26 05:54:39 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -186,7 +186,7 @@ pcimmap(dev_t dev, off_t offset, int pro
}
const struct cdevsw pci_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = pciopen,
.d_close = nullclose,
.d_read = noread,
Index: src/sys/dev/pud/pud_dev.c
diff -u src/sys/dev/pud/pud_dev.c:1.7.2.3 src/sys/dev/pud/pud_dev.c:1.7.2.4
--- src/sys/dev/pud/pud_dev.c:1.7.2.3 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/pud/pud_dev.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pud_dev.c,v 1.7.2.3 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: pud_dev.c,v 1.7.2.4 2016/07/26 05:54:39 pgoyette Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pud_dev.c,v 1.7.2.3 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pud_dev.c,v 1.7.2.4 2016/07/26 05:54:39 pgoyette Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -100,7 +100,7 @@ static dev_type_size(pud_bdev_size);
#endif
struct bdevsw pud_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = pud_bdev_open,
.d_close = pud_bdev_close,
.d_strategy = pud_bdev_strategy,
@@ -200,7 +200,7 @@ static dev_type_mmap(pud_cdev_mmap);
static dev_type_kqfilter(pud_cdev_kqfilter);
struct cdevsw pud_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = pud_cdev_open,
.d_close = pud_cdev_close,
.d_read = pud_cdev_read,
Index: src/sys/dev/putter/putter.c
diff -u src/sys/dev/putter/putter.c:1.35.8.2 src/sys/dev/putter/putter.c:1.35.8.3
--- src/sys/dev/putter/putter.c:1.35.8.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/putter/putter.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: putter.c,v 1.35.8.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: putter.c,v 1.35.8.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.35.8.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.35.8.3 2016/07/26 05:54:39 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@ dev_type_ioctl(puttercdioctl);
/* dev */
const struct cdevsw putter_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = puttercdopen,
.d_close = puttercdclose,
.d_read = noread,
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.345.2.5 src/sys/dev/raidframe/rf_netbsdkintf.c:1.345.2.6
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.345.2.5 Wed Jul 20 23:47:56 2016
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.345.2.5 2016/07/20 23:47:56 pgoyette Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.345.2.6 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.345.2.5 2016/07/20 23:47:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.345.2.6 2016/07/26 05:54:39 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -218,7 +218,7 @@ static dev_type_dump(raiddump);
static dev_type_size(raidsize);
const struct bdevsw raid_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = raidopen,
.d_close = raidclose,
.d_strategy = raidstrategy,
@@ -230,7 +230,7 @@ const struct bdevsw raid_bdevsw = {
};
const struct cdevsw raid_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = raidopen,
.d_close = raidclose,
.d_read = raidread,
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.331.2.2 src/sys/dev/scsipi/cd.c:1.331.2.3
--- src/sys/dev/scsipi/cd.c:1.331.2.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/scsipi/cd.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.331.2.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: cd.c,v 1.331.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.331.2.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.331.2.3 2016/07/26 05:54:39 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -205,7 +205,7 @@ static dev_type_dump(cddump);
static dev_type_size(cdsize);
const struct bdevsw cd_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = cdopen,
.d_close = cdclose,
.d_strategy = cdstrategy,
@@ -217,7 +217,7 @@ const struct bdevsw cd_bdevsw = {
};
const struct cdevsw cd_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = cdopen,
.d_close = cdclose,
.d_read = cdread,
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.317.2.2 src/sys/dev/scsipi/sd.c:1.317.2.3
--- src/sys/dev/scsipi/sd.c:1.317.2.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/scsipi/sd.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.317.2.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: sd.c,v 1.317.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.317.2.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.317.2.3 2016/07/26 05:54:39 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -159,7 +159,7 @@ static dev_type_dump(sddump);
static dev_type_size(sdsize);
const struct bdevsw sd_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = sdopen,
.d_close = sdclose,
.d_strategy = sdstrategy,
@@ -171,7 +171,7 @@ const struct bdevsw sd_bdevsw = {
};
const struct cdevsw sd_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = sdopen,
.d_close = sdclose,
.d_read = sdread,
Index: src/sys/dev/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.28.2.2 src/sys/dev/sysmon/sysmon.c:1.28.2.3
--- src/sys/dev/sysmon/sysmon.c:1.28.2.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/sysmon/sysmon.c Tue Jul 26 05:54:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.28.2.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.28.2.3 2016/07/26 05:54:39 pgoyette Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.28.2.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.28.2.3 2016/07/26 05:54:39 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -65,7 +65,7 @@ dev_type_poll(sysmonpoll);
dev_type_kqfilter(sysmonkqfilter);
const struct cdevsw sysmon_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = sysmonopen,
.d_close = sysmonclose,
.d_read = sysmonread,
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.113.2.2 src/sys/dev/usb/ucom.c:1.113.2.3
--- src/sys/dev/usb/ucom.c:1.113.2.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/usb/ucom.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.113.2.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: ucom.c,v 1.113.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.113.2.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.113.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -198,7 +198,7 @@ dev_type_tty(ucomtty);
dev_type_poll(ucompoll);
const struct cdevsw ucom_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = ucomopen,
.d_close = ucomclose,
.d_read = ucomread,
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.97.2.2 src/sys/dev/usb/ulpt.c:1.97.2.3
--- src/sys/dev/usb/ulpt.c:1.97.2.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/usb/ulpt.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.97.2.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: ulpt.c,v 1.97.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.97.2.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.97.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,7 +131,7 @@ dev_type_read(ulptread);
dev_type_ioctl(ulptioctl);
const struct cdevsw ulpt_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = ulptopen,
.d_close = ulptclose,
.d_read = ulptread,
Index: src/sys/dev/wscons/wskbd.c
diff -u src/sys/dev/wscons/wskbd.c:1.136.2.2 src/sys/dev/wscons/wskbd.c:1.136.2.3
--- src/sys/dev/wscons/wskbd.c:1.136.2.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/wscons/wskbd.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.136.2.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: wskbd.c,v 1.136.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.136.2.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.136.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -300,7 +300,7 @@ dev_type_poll(wskbdpoll);
dev_type_kqfilter(wskbdkqfilter);
const struct cdevsw wskbd_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = wskbdopen,
.d_close = wskbdclose,
.d_read = wskbdread,
Index: src/sys/dev/wscons/wsmouse.c
diff -u src/sys/dev/wscons/wsmouse.c:1.66.8.2 src/sys/dev/wscons/wsmouse.c:1.66.8.3
--- src/sys/dev/wscons/wsmouse.c:1.66.8.2 Tue Jul 19 06:26:59 2016
+++ src/sys/dev/wscons/wsmouse.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.66.8.2 2016/07/19 06:26:59 pgoyette Exp $ */
+/* $NetBSD: wsmouse.c,v 1.66.8.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.66.8.2 2016/07/19 06:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.66.8.3 2016/07/26 05:54:40 pgoyette Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@@ -204,7 +204,7 @@ dev_type_poll(wsmousepoll);
dev_type_kqfilter(wsmousekqfilter);
const struct cdevsw wsmouse_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = wsmouseopen,
.d_close = wsmouseclose,
.d_read = wsmouseread,
Index: src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.16.2.3 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.16.2.4
--- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.16.2.3 Tue Jul 26 03:24:22 2016
+++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.16.2.3 2016/07/26 03:24:22 pgoyette Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.16.2.4 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -8,7 +8,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.16.2.3 2016/07/26 03:24:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.16.2.4 2016/07/26 05:54:40 pgoyette Exp $");
#else
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -142,7 +142,7 @@ static void ipf_timer_func(void *ptr);
const struct cdevsw ipl_cdevsw = {
#if (__NetBSD_Version__ >= 799003300)
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
#endif
.d_open = ipfopen,
.d_close = ipfclose,
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.41.2.2 src/sys/kern/kern_drvctl.c:1.41.2.3
--- src/sys/kern/kern_drvctl.c:1.41.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/kern/kern_drvctl.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.41.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.41.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.41.2.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.41.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ static struct selinfo drvctl_rdsel;
dev_type_open(drvctlopen);
const struct cdevsw drvctl_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = drvctlopen,
.d_close = nullclose,
.d_read = nullread,
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.37.2.2 src/sys/kern/tty_ptm.c:1.37.2.3
--- src/sys/kern/tty_ptm.c:1.37.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/kern/tty_ptm.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.37.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.37.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.37.2.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.37.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v
#ifdef NO_DEV_PTM
const struct cdevsw ptm_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = noopen,
.d_close = noclose,
.d_read = noread,
@@ -429,7 +429,7 @@ bad2:
}
const struct cdevsw ptm_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = ptmopen,
.d_close = ptmclose,
.d_read = noread,
Index: src/sys/kern/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.142.2.3 src/sys/kern/tty_pty.c:1.142.2.4
--- src/sys/kern/tty_pty.c:1.142.2.3 Wed Jul 20 23:47:57 2016
+++ src/sys/kern/tty_pty.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.142.2.3 2016/07/20 23:47:57 pgoyette Exp $ */
+/* $NetBSD: tty_pty.c,v 1.142.2.4 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.142.2.3 2016/07/20 23:47:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.142.2.4 2016/07/26 05:54:40 pgoyette Exp $");
#include "opt_ptm.h"
@@ -113,7 +113,7 @@ dev_type_ioctl(ptyioctl);
dev_type_tty(ptytty);
const struct cdevsw ptc_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = ptcopen,
.d_close = ptcclose,
.d_read = ptcread,
@@ -129,7 +129,7 @@ const struct cdevsw ptc_cdevsw = {
};
const struct cdevsw pts_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = ptsopen,
.d_close = ptsclose,
.d_read = ptsread,
Index: src/sys/kern/tty_tty.c
diff -u src/sys/kern/tty_tty.c:1.40.8.2 src/sys/kern/tty_tty.c:1.40.8.3
--- src/sys/kern/tty_tty.c:1.40.8.2 Tue Jul 19 06:27:00 2016
+++ src/sys/kern/tty_tty.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_tty.c,v 1.40.8.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: tty_tty.c,v 1.40.8.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993, 1995
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_tty.c,v 1.40.8.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_tty.c,v 1.40.8.3 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -158,7 +158,7 @@ cttykqfilter(dev_t dev, struct knote *kn
}
const struct cdevsw ctty_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = cttyopen,
.d_close = nullclose,
.d_read = cttyread,
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.199.2.2 src/sys/net/bpf.c:1.199.2.3
--- src/sys/net/bpf.c:1.199.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/net/bpf.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.199.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: bpf.c,v 1.199.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.199.2.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.199.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -181,7 +181,7 @@ static const struct fileops bpf_fileops
dev_type_open(bpfopen);
const struct cdevsw bpf_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = bpfopen,
.d_close = noclose,
.d_read = noread,
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.84.2.2 src/sys/net/if_tap.c:1.84.2.3
--- src/sys/net/if_tap.c:1.84.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/net/if_tap.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.84.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: if_tap.c,v 1.84.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.84.2.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.84.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#if defined(_KERNEL_OPT)
@@ -174,7 +174,7 @@ static int tap_cdev_poll(dev_t, int, str
static int tap_cdev_kqfilter(dev_t, struct knote *);
const struct cdevsw tap_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = tap_cdev_open,
.d_close = tap_cdev_close,
.d_read = tap_cdev_read,
Index: src/sys/net/npf/npf.c
diff -u src/sys/net/npf/npf.c:1.31.2.2 src/sys/net/npf/npf.c:1.31.2.3
--- src/sys/net/npf/npf.c:1.31.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/net/npf/npf.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.31.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: npf.c,v 1.31.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.31.2.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.31.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -89,7 +89,7 @@ static percpu_t * npf_stats_percpu __re
static struct sysctllog * npf_sysctl __read_mostly;
const struct cdevsw npf_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = npf_dev_open,
.d_close = npf_dev_close,
.d_read = npf_dev_read,
Index: src/sys/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.44.2.3 src/sys/netsmb/smb_dev.c:1.44.2.4
--- src/sys/netsmb/smb_dev.c:1.44.2.3 Tue Jul 26 03:24:23 2016
+++ src/sys/netsmb/smb_dev.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.44.2.3 2016/07/26 03:24:23 pgoyette Exp $ */
+/* $NetBSD: smb_dev.c,v 1.44.2.4 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.44.2.3 2016/07/26 03:24:23 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.44.2.4 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -88,7 +88,7 @@ dev_type_close(nsmb_dev_close);
dev_type_ioctl(nsmb_dev_ioctl);
const struct cdevsw nsmb_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = nsmb_dev_open,
.d_close = nsmb_dev_close,
.d_read = noread,
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.85.2.2 src/sys/opencrypto/cryptodev.c:1.85.2.3
--- src/sys/opencrypto/cryptodev.c:1.85.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/opencrypto/cryptodev.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.85.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: cryptodev.c,v 1.85.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.85.2.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.85.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1112,7 +1112,7 @@ cryptoselect(dev_t dev, int rw, struct l
/*static*/
struct cdevsw crypto_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = cryptoopen,
.d_close = noclose,
.d_read = cryptoread,
Index: src/sys/rump/librump/rumpvfs/devnull.c
diff -u src/sys/rump/librump/rumpvfs/devnull.c:1.7.2.2 src/sys/rump/librump/rumpvfs/devnull.c:1.7.2.3
--- src/sys/rump/librump/rumpvfs/devnull.c:1.7.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/rump/librump/rumpvfs/devnull.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: devnull.c,v 1.7.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: devnull.c,v 1.7.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: devnull.c,v 1.7.2.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: devnull.c,v 1.7.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -47,7 +47,7 @@ static dev_type_open(rump_devnullopen);
static dev_type_read(rump_devnullrw);
static struct cdevsw null_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = rump_devnullopen,
.d_close = nullclose,
.d_read = rump_devnullrw,
Index: src/sys/rump/librump/rumpvfs/rumpblk.c
diff -u src/sys/rump/librump/rumpvfs/rumpblk.c:1.64.2.2 src/sys/rump/librump/rumpvfs/rumpblk.c:1.64.2.3
--- src/sys/rump/librump/rumpvfs/rumpblk.c:1.64.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/rump/librump/rumpvfs/rumpblk.c Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpblk.c,v 1.64.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: rumpblk.c,v 1.64.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.64.2.2 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.64.2.3 2016/07/26 05:54:40 pgoyette Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -96,7 +96,7 @@ dev_type_dump(rumpblk_dump);
dev_type_size(rumpblk_size);
static const struct bdevsw rumpblk_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = rumpblk_open,
.d_close = rumpblk_close,
.d_strategy = rumpblk_strategy,
@@ -108,7 +108,7 @@ static const struct bdevsw rumpblk_bdevs
};
static const struct bdevsw rumpblk_bdevsw_fail = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = rumpblk_open,
.d_close = rumpblk_close,
.d_strategy = rumpblk_strategy_fail,
@@ -120,7 +120,7 @@ static const struct bdevsw rumpblk_bdevs
};
static const struct cdevsw rumpblk_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = rumpblk_open,
.d_close = rumpblk_close,
.d_read = rumpblk_read,
Index: src/sys/sys/localcount.h
diff -u src/sys/sys/localcount.h:1.1.2.2 src/sys/sys/localcount.h:1.1.2.3
--- src/sys/sys/localcount.h:1.1.2.2 Tue Jul 19 06:27:00 2016
+++ src/sys/sys/localcount.h Tue Jul 26 05:54:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: localcount.h,v 1.1.2.2 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: localcount.h,v 1.1.2.3 2016/07/26 05:54:40 pgoyette Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -56,10 +56,10 @@ void localcount_release(struct localcoun
struct kmutex *);
#ifdef _MODULE
-#define LOCALCOUNT_INITIALIZER \
+#define DEVSW_MODULE_INIT \
.d_localcount = &(struct localcount){NULL, NULL},
#else
-#define LOCALCOUNT_INITIALIZER
+#define DEVSW_MODULE_INIT
#endif
#endif /* _SYS_LOCALCOUNT_H */
