Module Name: src
Committed By: pgoyette
Date: Mon Jul 18 03:50:00 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/pci [pgoyette-localcount]: pci_usrreq.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/kern [pgoyette-localcount]: kern_drvctl.c tty_ptm.c tty_pty.c
tty_tty.c
src/sys/net [pgoyette-localcount]: if_tap.c
src/sys/net/npf [pgoyette-localcount]: npf.c
src/sys/opencrypto [pgoyette-localcount]: cryptodev.c
src/sys/rump/librump/rumpvfs [pgoyette-localcount]: devnull.c rumpblk.c
Log Message:
Rump drivers are always installed via devsw_attach() so we need to
always allocate a 'struct localcount' for these drivers whenever they
are built as modules.
To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.268.2.1 src/sys/dev/audio.c
cvs rdiff -u -r1.108 -r1.108.2.1 src/sys/dev/cgd.c
cvs rdiff -u -r1.93 -r1.93.2.1 src/sys/dev/fss.c
cvs rdiff -u -r1.94 -r1.94.2.1 src/sys/dev/ld.c
cvs rdiff -u -r1.76 -r1.76.2.1 src/sys/dev/md.c
cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.256 -r1.256.2.1 src/sys/dev/vnd.c
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.29 -r1.29.2.1 src/sys/dev/pci/pci_usrreq.c
cvs rdiff -u -r1.331 -r1.331.2.1 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.317 -r1.317.2.1 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/dev/sysmon/sysmon.c
cvs rdiff -u -r1.113 -r1.113.2.1 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.97 -r1.97.2.1 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.136 -r1.136.2.1 src/sys/dev/wscons/wskbd.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/dev/wscons/wsmouse.c
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/kern/tty_pty.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/kern/tty_tty.c
cvs rdiff -u -r1.84 -r1.84.2.1 src/sys/net/if_tap.c
cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/net/npf/npf.c
cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/rump/librump/rumpvfs/devnull.c
cvs rdiff -u -r1.64 -r1.64.2.1 src/sys/rump/librump/rumpvfs/rumpblk.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/dev/audio.c
diff -u src/sys/dev/audio.c:1.268 src/sys/dev/audio.c:1.268.2.1
--- src/sys/dev/audio.c:1.268 Thu Jul 14 10:19:05 2016
+++ src/sys/dev/audio.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.268 2016/07/14 10:19:05 msaitoh Exp $ */
+/* $NetBSD: audio.c,v 1.268.2.1 2016/07/18 03:49:59 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 2016/07/14 10:19:05 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.268.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -178,6 +178,7 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.
#include <sys/device.h>
#include <sys/intr.h>
#include <sys/cpu.h>
+#include <sys/localcount.h>
#include <dev/audio_if.h>
#include <dev/audiovar.h>
@@ -346,6 +347,10 @@ dev_type_poll(audiopoll);
dev_type_mmap(audiommap);
dev_type_kqfilter(audiokqfilter);
+#ifdef _MODULE
+struct localcount audio_localcount;
+#endif
+
const struct cdevsw audio_cdevsw = {
.d_open = audioopen,
.d_close = audioclose,
@@ -358,6 +363,9 @@ const struct cdevsw audio_cdevsw = {
.d_mmap = audiommap,
.d_kqfilter = audiokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &audio_localcount,
+#endif
.d_flag = D_OTHER | D_MPSAFE
};
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.108 src/sys/dev/cgd.c:1.108.2.1
--- src/sys/dev/cgd.c:1.108 Sun Jul 10 17:40:23 2016
+++ src/sys/dev/cgd.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.108 2016/07/10 17:40:23 riastradh Exp $ */
+/* $NetBSD: cgd.c,v 1.108.2.1 2016/07/18 03:49:59 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 2016/07/10 17:40:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.108.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.10
#include <sys/vnode.h>
#include <sys/conf.h>
#include <sys/syslog.h>
+#include <sys/localcount.h>
#include <dev/dkvar.h>
#include <dev/cgdvar.h>
@@ -70,6 +71,10 @@ static dev_type_strategy(cgdstrategy);
static dev_type_dump(cgddump);
static dev_type_size(cgdsize);
+#ifdef _MODULE
+struct localcount cgd_b_localcount, cgd_c_localcount;
+#endif
+
const struct bdevsw cgd_bdevsw = {
.d_open = cgdopen,
.d_close = cgdclose,
@@ -78,6 +83,9 @@ const struct bdevsw cgd_bdevsw = {
.d_dump = cgddump,
.d_psize = cgdsize,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &cgd_b_localcount,
+#endif
.d_flag = D_DISK
};
@@ -93,6 +101,9 @@ const struct cdevsw cgd_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &cgd_c_localcount,
+#endif
.d_flag = D_DISK
};
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.93 src/sys/dev/fss.c:1.93.2.1
--- src/sys/dev/fss.c:1.93 Thu Aug 20 14:40:17 2015
+++ src/sys/dev/fss.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.93 2015/08/20 14:40:17 christos Exp $ */
+/* $NetBSD: fss.c,v 1.93.2.1 2016/07/18 03:49:59 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 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.93.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,6 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.93
#include <sys/kthread.h>
#include <sys/fstrans.h>
#include <sys/vfs_syscalls.h> /* For do_sys_unlink(). */
+#include <sys/localcount.h>
#include <miscfs/specfs/specdev.h>
@@ -98,6 +99,10 @@ static struct vfs_hooks fss_vfs_hooks =
.vh_unmount = fss_unmount_hook
};
+#ifdef _MODULE
+struct localcount fss_b_localcount, fss_c_localcount;
+#endif
+
const struct bdevsw fss_bdevsw = {
.d_open = fss_open,
.d_close = fss_close,
@@ -106,6 +111,9 @@ const struct bdevsw fss_bdevsw = {
.d_dump = fss_dump,
.d_psize = fss_size,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &fss_b_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
@@ -121,6 +129,9 @@ const struct cdevsw fss_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &fss_c_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
Index: src/sys/dev/ld.c
diff -u src/sys/dev/ld.c:1.94 src/sys/dev/ld.c:1.94.2.1
--- src/sys/dev/ld.c:1.94 Sat Feb 27 08:54:49 2016
+++ src/sys/dev/ld.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.94 2016/02/27 08:54:49 mlelstv Exp $ */
+/* $NetBSD: ld.c,v 1.94.2.1 2016/07/18 03:49:59 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 2016/02/27 08:54:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.94.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.94
#include <sys/vnode.h>
#include <sys/syslog.h>
#include <sys/mutex.h>
+#include <sys/localcount.h>
#include <dev/ldvar.h>
@@ -83,6 +84,10 @@ static dev_type_dump(lddump);
static dev_type_size(ldsize);
static dev_type_discard(lddiscard);
+#ifdef _MODULE
+struct localcount ld_b_localcount, ld_c_localcount;
+#endif
+
const struct bdevsw ld_bdevsw = {
.d_open = ldopen,
.d_close = ldclose,
@@ -91,6 +96,9 @@ const struct bdevsw ld_bdevsw = {
.d_dump = lddump,
.d_psize = ldsize,
.d_discard = lddiscard,
+#ifdef _MODULE
+ .d_localcount = &ld_b_localcount;
+#endif
.d_flag = D_DISK | D_MPSAFE
};
@@ -106,6 +114,9 @@ const struct cdevsw ld_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = lddiscard,
+#ifdef _MODULE
+ .d_localcount = &ld_c_localcount;
+#endif
.d_flag = D_DISK | D_MPSAFE
};
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.76 src/sys/dev/md.c:1.76.2.1
--- src/sys/dev/md.c:1.76 Mon Jan 4 16:24:52 2016
+++ src/sys/dev/md.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.76 2016/01/04 16:24:52 hannken Exp $ */
+/* $NetBSD: md.c,v 1.76.2.1 2016/07/18 03:49:59 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 2016/01/04 16:24:52 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.76.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: md.c,v 1.76
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/disklabel.h>
+#include <sys/localcount.h>
#include <uvm/uvm_extern.h>
@@ -105,6 +106,10 @@ static dev_type_ioctl(mdioctl);
static dev_type_strategy(mdstrategy);
static dev_type_size(mdsize);
+#ifdef _MODULE
+struct localcount md_b_localcount, md_c_localcount;
+#endif
+
const struct bdevsw md_bdevsw = {
.d_open = mdopen,
.d_close = mdclose,
@@ -113,6 +118,9 @@ const struct bdevsw md_bdevsw = {
.d_dump = nodump,
.d_psize = mdsize,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &md_b_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
@@ -128,6 +136,9 @@ const struct cdevsw md_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &md_c_localcount,
+#endif
.d_flag = D_DISK
};
Index: src/sys/dev/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.35 src/sys/dev/rndpseudo.c:1.35.2.1
--- src/sys/dev/rndpseudo.c:1.35 Thu Aug 20 14:40:17 2015
+++ src/sys/dev/rndpseudo.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.35 2015/08/20 14:40:17 christos Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.35.2.1 2016/07/18 03:49:59 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 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.35.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -62,6 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,
#include <sys/stat.h>
#include <sys/systm.h>
#include <sys/vnode.h>
+#include <sys/localcount.h>
#include <dev/rnd_private.h>
@@ -109,6 +110,10 @@ static percpu_t *percpu_urandom_cprng __
dev_type_open(rndopen);
+#ifdef _MODULE
+struct localcount rnd_localcount;
+#endif
+
const struct cdevsw rnd_cdevsw = {
.d_open = rndopen,
.d_close = noclose,
@@ -121,6 +126,9 @@ const struct cdevsw rnd_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &rnd_localcount,
+#endif
.d_flag = D_OTHER | D_MPSAFE
};
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.256 src/sys/dev/vnd.c:1.256.2.1
--- src/sys/dev/vnd.c:1.256 Tue Dec 8 20:36:14 2015
+++ src/sys/dev/vnd.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.256 2015/12/08 20:36:14 christos Exp $ */
+/* $NetBSD: vnd.c,v 1.256.2.1 2016/07/18 03:49:59 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 2015/12/08 20:36:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -118,6 +118,7 @@ __KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.25
#include <sys/uio.h>
#include <sys/conf.h>
#include <sys/kauth.h>
+#include <sys/localcount.h>
#include <net/zlib.h>
@@ -196,6 +197,10 @@ static dev_type_strategy(vndstrategy);
static dev_type_dump(vnddump);
static dev_type_size(vndsize);
+#ifdef _MODULE
+struct localcount vnd_b_localcount, vnd_c_localcount;
+#endif
+
const struct bdevsw vnd_bdevsw = {
.d_open = vndopen,
.d_close = vndclose,
@@ -204,6 +209,9 @@ const struct bdevsw vnd_bdevsw = {
.d_dump = vnddump,
.d_psize = vndsize,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &vnd_b_localcount,
+#endif
.d_flag = D_DISK
};
@@ -219,6 +227,9 @@ const struct cdevsw vnd_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &vnd_b_localcount,
+#endif
.d_flag = D_DISK
};
Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.38 src/sys/dev/dm/device-mapper.c:1.38.2.1
--- src/sys/dev/dm/device-mapper.c:1.38 Mon Jul 11 11:31:50 2016
+++ src/sys/dev/dm/device-mapper.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.38 2016/07/11 11:31:50 msaitoh Exp $ */
+/* $NetBSD: device-mapper.c,v 1.38.2.1 2016/07/18 03:49:59 pgoyette Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -46,6 +46,7 @@
#include <sys/ioccom.h>
#include <sys/kmem.h>
#include <sys/kauth.h>
+#include <sys/localcount.h>
#include "netbsd-dm.h"
#include "dm.h"
@@ -77,6 +78,11 @@ static void dm_attach(device_t, device_t
static int dm_match(device_t, cfdata_t, void *);
/* ***Variable-definitions*** */
+
+#ifdef _MODULE
+struct localcount dm_b_localcount, dm_c_localcount;
+#endif
+
const struct bdevsw dm_bdevsw = {
.d_open = dmopen,
.d_close = dmclose,
@@ -85,6 +91,9 @@ const struct bdevsw dm_bdevsw = {
.d_dump = nodump,
.d_psize = dmsize,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &dm_b_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
@@ -100,6 +109,9 @@ const struct cdevsw dm_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &dm_c_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
Index: src/sys/dev/pci/pci_usrreq.c
diff -u src/sys/dev/pci/pci_usrreq.c:1.29 src/sys/dev/pci/pci_usrreq.c:1.29.2.1
--- src/sys/dev/pci/pci_usrreq.c:1.29 Mon Aug 24 23:55:04 2015
+++ src/sys/dev/pci/pci_usrreq.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_usrreq.c,v 1.29 2015/08/24 23:55:04 pooka Exp $ */
+/* $NetBSD: pci_usrreq.c,v 1.29.2.1 2016/07/18 03:49:59 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 2015/08/24 23:55:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.29.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c
#include <sys/errno.h>
#include <sys/fcntl.h>
#include <sys/kauth.h>
+#include <sys/localcount.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@@ -184,6 +185,10 @@ pcimmap(dev_t dev, off_t offset, int pro
return bus_space_mmap(sc->sc_memt, offset, 0, prot, flags);
}
+#ifdef _MODULE
+struct localcount pci_localcount;
+#endif
+
const struct cdevsw pci_cdevsw = {
.d_open = pciopen,
.d_close = nullclose,
@@ -196,6 +201,9 @@ const struct cdevsw pci_cdevsw = {
.d_mmap = pcimmap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &pci_localcount,
+#endif
.d_flag = D_OTHER
};
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.331 src/sys/dev/scsipi/cd.c:1.331.2.1
--- src/sys/dev/scsipi/cd.c:1.331 Sun May 15 15:37:38 2016
+++ src/sys/dev/scsipi/cd.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.331 2016/05/15 15:37:38 reinoud Exp $ */
+/* $NetBSD: cd.c,v 1.331.2.1 2016/07/18 03:49:59 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 2016/05/15 15:37:38 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.331.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,6 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.331
#include <sys/conf.h>
#include <sys/vnode.h>
#include <sys/rndsource.h>
+#include <sys/localcount.h>
#include <dev/scsipi/scsi_spc.h>
#include <dev/scsipi/scsipi_all.h>
@@ -203,6 +204,10 @@ static dev_type_strategy(cdstrategy);
static dev_type_dump(cddump);
static dev_type_size(cdsize);
+#ifdef _MODULE
+struct localcount cd_b_localcount, cd_c_localcount;
+#endif
+
const struct bdevsw cd_bdevsw = {
.d_open = cdopen,
.d_close = cdclose,
@@ -211,6 +216,9 @@ const struct bdevsw cd_bdevsw = {
.d_dump = cddump,
.d_psize = cdsize,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &cd_b_localcount,
+#endif
.d_flag = D_DISK
};
@@ -226,6 +234,9 @@ const struct cdevsw cd_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &cd_c_localcount,
+#endif
.d_flag = D_DISK
};
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.317 src/sys/dev/scsipi/sd.c:1.317.2.1
--- src/sys/dev/scsipi/sd.c:1.317 Mon Aug 24 23:13:15 2015
+++ src/sys/dev/scsipi/sd.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.317 2015/08/24 23:13:15 pooka Exp $ */
+/* $NetBSD: sd.c,v 1.317.2.1 2016/07/18 03:49:59 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 2015/08/24 23:13:15 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.317.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -72,6 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.317
#include <sys/conf.h>
#include <sys/vnode.h>
#include <sys/rndsource.h>
+#include <sys/localcount.h>
#include <dev/scsipi/scsi_spc.h>
#include <dev/scsipi/scsipi_all.h>
@@ -157,6 +158,10 @@ static dev_type_strategy(sdstrategy);
static dev_type_dump(sddump);
static dev_type_size(sdsize);
+#ifdef _MODULE
+struct localcount sd_b_localcount, sd_c_localcount;
+#endif
+
const struct bdevsw sd_bdevsw = {
.d_open = sdopen,
.d_close = sdclose,
@@ -165,6 +170,9 @@ const struct bdevsw sd_bdevsw = {
.d_dump = sddump,
.d_psize = sdsize,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &sd_b_localcount,
+#endif
.d_flag = D_DISK
};
@@ -180,6 +188,9 @@ const struct cdevsw sd_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &sd_c_localcount,
+#endif
.d_flag = D_DISK
};
Index: src/sys/dev/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.28 src/sys/dev/sysmon/sysmon.c:1.28.2.1
--- src/sys/dev/sysmon/sysmon.c:1.28 Tue May 5 09:22:33 2015
+++ src/sys/dev/sysmon/sysmon.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.28 2015/05/05 09:22:33 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.28.2.1 2016/07/18 03:49:59 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 2015/05/05 09:22:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.28.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1
#include <sys/mutex.h>
#include <sys/device.h>
#include <sys/once.h>
+#include <sys/localcount.h>
#include <dev/sysmon/sysmonvar.h>
@@ -63,6 +64,10 @@ dev_type_read(sysmonread);
dev_type_poll(sysmonpoll);
dev_type_kqfilter(sysmonkqfilter);
+#ifdef _MODULE
+struct localcount sysmon_localcount;
+#endif
+
const struct cdevsw sysmon_cdevsw = {
.d_open = sysmonopen,
.d_close = sysmonclose,
@@ -75,6 +80,9 @@ const struct cdevsw sysmon_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = sysmonkqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &sysmon_localcount,
+#endif
.d_flag = D_OTHER | D_MPSAFE
};
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.113 src/sys/dev/usb/ucom.c:1.113.2.1
--- src/sys/dev/usb/ucom.c:1.113 Sat May 14 10:52:29 2016
+++ src/sys/dev/usb/ucom.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.113 2016/05/14 10:52:29 mlelstv Exp $ */
+/* $NetBSD: ucom.c,v 1.113.2.1 2016/07/18 03:49:59 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 2016/05/14 10:52:29 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.113.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.1
#include <sys/sysctl.h>
#include <sys/timepps.h>
#include <sys/rndsource.h>
+#include <sys/localcount.h>
#include <dev/usb/usb.h>
@@ -196,6 +197,10 @@ dev_type_stop(ucomstop);
dev_type_tty(ucomtty);
dev_type_poll(ucompoll);
+#ifdef _MODULE
+struct localcount ucom_localcount;
+#endif
+
const struct cdevsw ucom_cdevsw = {
.d_open = ucomopen,
.d_close = ucomclose,
@@ -208,6 +213,9 @@ const struct cdevsw ucom_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = ttykqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &ucom_localcount,
+#endif
.d_flag = D_TTY | D_MPSAFE
};
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.97 src/sys/dev/usb/ulpt.c:1.97.2.1
--- src/sys/dev/usb/ulpt.c:1.97 Thu Jul 7 06:55:42 2016
+++ src/sys/dev/usb/ulpt.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.97 2016/07/07 06:55:42 msaitoh Exp $ */
+/* $NetBSD: ulpt.c,v 1.97.2.1 2016/07/18 03:49:59 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 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.97.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.9
#include <sys/conf.h>
#include <sys/vnode.h>
#include <sys/syslog.h>
+#include <sys/localcount.h>
#include <machine/vmparam.h> /* PAGE_SIZE */
@@ -129,6 +130,10 @@ dev_type_write(ulptwrite);
dev_type_read(ulptread);
dev_type_ioctl(ulptioctl);
+#ifdef _MODULE
+struct localcount ulpt_localcount;
+#endif
+
const struct cdevsw ulpt_cdevsw = {
.d_open = ulptopen,
.d_close = ulptclose,
@@ -141,6 +146,9 @@ const struct cdevsw ulpt_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &ulpt_localcount,
+#endif
.d_flag = D_OTHER
};
Index: src/sys/dev/wscons/wskbd.c
diff -u src/sys/dev/wscons/wskbd.c:1.136 src/sys/dev/wscons/wskbd.c:1.136.2.1
--- src/sys/dev/wscons/wskbd.c:1.136 Mon Aug 24 22:50:33 2015
+++ src/sys/dev/wscons/wskbd.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.136 2015/08/24 22:50:33 pooka Exp $ */
+/* $NetBSD: wskbd.c,v 1.136.2.1 2016/07/18 03:49:59 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 2015/08/24 22:50:33 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.136.2.1 2016/07/18 03:49:59 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -134,6 +134,7 @@ __KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.
#include <sys/fcntl.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
+#include <sys/localcount.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wskbdvar.h>
@@ -298,6 +299,10 @@ dev_type_ioctl(wskbdioctl);
dev_type_poll(wskbdpoll);
dev_type_kqfilter(wskbdkqfilter);
+#ifdef _MODULE
+struct localcount wskbd_localcount;
+#endif
+
const struct cdevsw wskbd_cdevsw = {
.d_open = wskbdopen,
.d_close = wskbdclose,
@@ -310,6 +315,9 @@ const struct cdevsw wskbd_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = wskbdkqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &wskbd_localcount,
+#endif
.d_flag = D_OTHER
};
Index: src/sys/dev/wscons/wsmouse.c
diff -u src/sys/dev/wscons/wsmouse.c:1.66 src/sys/dev/wscons/wsmouse.c:1.66.8.1
--- src/sys/dev/wscons/wsmouse.c:1.66 Fri Jul 25 08:10:39 2014
+++ src/sys/dev/wscons/wsmouse.c Mon Jul 18 03:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.66 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: wsmouse.c,v 1.66.8.1 2016/07/18 03:49:59 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 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.66.8.1 2016/07/18 03:49:59 pgoyette Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@@ -125,6 +125,7 @@ __KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v
#include <sys/vnode.h>
#include <sys/callout.h>
#include <sys/malloc.h>
+#include <sys/localcount.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsmousevar.h>
@@ -202,6 +203,10 @@ dev_type_ioctl(wsmouseioctl);
dev_type_poll(wsmousepoll);
dev_type_kqfilter(wsmousekqfilter);
+#ifdef _MODULE
+struct localcount wsmouse_localcount;
+#endif
+
const struct cdevsw wsmouse_cdevsw = {
.d_open = wsmouseopen,
.d_close = wsmouseclose,
@@ -214,6 +219,9 @@ const struct cdevsw wsmouse_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = wsmousekqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &wsmouse_localcount,
+#endif
.d_flag = D_OTHER
};
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.41 src/sys/kern/kern_drvctl.c:1.41.2.1
--- src/sys/kern/kern_drvctl.c:1.41 Mon Dec 7 20:01:43 2015
+++ src/sys/kern/kern_drvctl.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.41 2015/12/07 20:01:43 christos Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.41.2.1 2016/07/18 03:50:00 pgoyette Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.41 2015/12/07 20:01:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.41.2.1 2016/07/18 03:50:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_drvctl.
#include <sys/kauth.h>
#include <sys/lwp.h>
#include <sys/module.h>
+#include <sys/localcount.h>
#include "ioconf.h"
@@ -68,6 +69,10 @@ static struct selinfo drvctl_rdsel;
dev_type_open(drvctlopen);
+#ifdef _MODULE
+struct localcount drvctl_localcount;
+#endif
+
const struct cdevsw drvctl_cdevsw = {
.d_open = drvctlopen,
.d_close = nullclose,
@@ -80,6 +85,9 @@ const struct cdevsw drvctl_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &drvctl_localcount,
+#endif
.d_flag = D_OTHER
};
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.37 src/sys/kern/tty_ptm.c:1.37.2.1
--- src/sys/kern/tty_ptm.c:1.37 Mon Aug 24 22:50:32 2015
+++ src/sys/kern/tty_ptm.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.37 2015/08/24 22:50:32 pooka Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.37.2.1 2016/07/18 03:50:00 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 2015/08/24 22:50:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.37.2.1 2016/07/18 03:50:00 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v
#include <sys/poll.h>
#include <sys/pty.h>
#include <sys/kauth.h>
+#include <sys/localcount.h>
#include <miscfs/specfs/specdev.h>
@@ -68,6 +69,10 @@ __KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v
#define DPRINTF(a)
#endif
+#ifdef _MODULE
+struct localcount ptm_localcount;
+#endif
+
#ifdef NO_DEV_PTM
const struct cdevsw ptm_cdevsw = {
.d_open = noopen,
@@ -81,9 +86,12 @@ const struct cdevsw ptm_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = ptm_localcount,
+#endif
.d_flag = D_TTY
};
-#else
+#else /* NO_DEV_PTM */
static struct ptm_pty *ptm;
int pts_major, ptc_major;
@@ -438,6 +446,9 @@ const struct cdevsw ptm_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &ptm_localcount,
+#endif
.d_flag = D_TTY
};
#endif
Index: src/sys/kern/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.142 src/sys/kern/tty_pty.c:1.142.2.1
--- src/sys/kern/tty_pty.c:1.142 Thu Aug 20 09:45:45 2015
+++ src/sys/kern/tty_pty.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.142 2015/08/20 09:45:45 christos Exp $ */
+/* $NetBSD: tty_pty.c,v 1.142.2.1 2016/07/18 03:50:00 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 2015/08/20 09:45:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.142.2.1 2016/07/18 03:50:00 pgoyette Exp $");
#include "opt_ptm.h"
@@ -61,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v
#include <sys/poll.h>
#include <sys/pty.h>
#include <sys/kauth.h>
+#include <sys/localcount.h>
#include "ioconf.h"
@@ -111,6 +112,10 @@ dev_type_poll(ptspoll);
dev_type_ioctl(ptyioctl);
dev_type_tty(ptytty);
+#ifdef _MODULE
+struct localcount ptc_localcount, pts_localcount;
+#endif
+
const struct cdevsw ptc_cdevsw = {
.d_open = ptcopen,
.d_close = ptcclose,
@@ -123,6 +128,9 @@ const struct cdevsw ptc_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = ptckqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &ptc_localcount,
+#endif
.d_flag = D_TTY
};
@@ -138,6 +146,9 @@ const struct cdevsw pts_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = ttykqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &pts_localcount,
+#endif
.d_flag = D_TTY
};
Index: src/sys/kern/tty_tty.c
diff -u src/sys/kern/tty_tty.c:1.40 src/sys/kern/tty_tty.c:1.40.8.1
--- src/sys/kern/tty_tty.c:1.40 Fri Jul 25 08:10:40 2014
+++ src/sys/kern/tty_tty.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_tty.c,v 1.40 2014/07/25 08:10:40 dholland Exp $ */
+/* $NetBSD: tty_tty.c,v 1.40.8.1 2016/07/18 03:50:00 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 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_tty.c,v 1.40.8.1 2016/07/18 03:50:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: tty_tty.c,v
#include <sys/file.h>
#include <sys/conf.h>
#include <sys/kauth.h>
+#include <sys/localcount.h>
/* XXXSMP */
#define cttyvp(p) ((p)->p_lflag & PL_CONTROLT ? (p)->p_session->s_ttyvp : NULL)
@@ -156,6 +157,10 @@ cttykqfilter(dev_t dev, struct knote *kn
return (VOP_KQFILTER(ttyvp, kn));
}
+#ifdef _MODULE
+struct localcount ctty_localcount;
+#endif
+
const struct cdevsw ctty_cdevsw = {
.d_open = cttyopen,
.d_close = nullclose,
@@ -168,5 +173,8 @@ const struct cdevsw ctty_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = cttykqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &ctty_localcount,
+#endif
.d_flag = D_TTY
};
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.84 src/sys/net/if_tap.c:1.84.2.1
--- src/sys/net/if_tap.c:1.84 Fri Jun 10 13:27:16 2016
+++ src/sys/net/if_tap.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.84 2016/06/10 13:27:16 ozaki-r Exp $ */
+/* $NetBSD: if_tap.c,v 1.84.2.1 2016/07/18 03:50:00 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 2016/06/10 13:27:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.84.2.1 2016/07/18 03:50:00 pgoyette Exp $");
#if defined(_KERNEL_OPT)
@@ -61,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1
#include <sys/mutex.h>
#include <sys/intr.h>
#include <sys/stat.h>
+#include <sys/localcount.h>
#include <net/if.h>
#include <net/if_dl.h>
@@ -172,6 +173,10 @@ static int tap_cdev_ioctl(dev_t, u_long,
static int tap_cdev_poll(dev_t, int, struct lwp *);
static int tap_cdev_kqfilter(dev_t, struct knote *);
+#ifdef _MODULE
+struct localcount tap_localcount;
+#endif
+
const struct cdevsw tap_cdevsw = {
.d_open = tap_cdev_open,
.d_close = tap_cdev_close,
@@ -184,6 +189,9 @@ const struct cdevsw tap_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = tap_cdev_kqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &tap_localcount,
+#endif
.d_flag = D_OTHER
};
Index: src/sys/net/npf/npf.c
diff -u src/sys/net/npf/npf.c:1.31 src/sys/net/npf/npf.c:1.31.2.1
--- src/sys/net/npf/npf.c:1.31 Thu Oct 29 15:19:43 2015
+++ src/sys/net/npf/npf.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.31 2015/10/29 15:19:43 christos Exp $ */
+/* $NetBSD: npf.c,v 1.31.2.1 2016/07/18 03:50:00 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 2015/10/29 15:19:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.31.2.1 2016/07/18 03:50:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.31
#include <sys/socketvar.h>
#include <sys/sysctl.h>
#include <sys/uio.h>
+#include <sys/localcount.h>
#include "npf_impl.h"
#include "npf_conn.h"
@@ -87,6 +88,10 @@ static int npfctl_stats(void *);
static percpu_t * npf_stats_percpu __read_mostly;
static struct sysctllog * npf_sysctl __read_mostly;
+#ifdef _MODULE
+struct localcount npf_localcount;
+#endif
+
const struct cdevsw npf_cdevsw = {
.d_open = npf_dev_open,
.d_close = npf_dev_close,
@@ -99,6 +104,9 @@ const struct cdevsw npf_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &npf_localcount,
+#endif
.d_flag = D_OTHER | D_MPSAFE
};
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.85 src/sys/opencrypto/cryptodev.c:1.85.2.1
--- src/sys/opencrypto/cryptodev.c:1.85 Thu Jul 7 06:55:43 2016
+++ src/sys/opencrypto/cryptodev.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.85 2016/07/07 06:55:43 msaitoh Exp $ */
+/* $NetBSD: cryptodev.c,v 1.85.2.1 2016/07/18 03:50:00 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 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.85.2.1 2016/07/18 03:50:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,6 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: cryptodev.c,
#include <sys/atomic.h>
#include <sys/stat.h>
#include <sys/module.h>
+#include <sys/localcount.h>
#ifdef _KERNEL_OPT
#include "opt_ocf.h"
@@ -1109,6 +1110,10 @@ cryptoselect(dev_t dev, int rw, struct l
return 0;
}
+#ifdef _MODULE
+struct localcount crypto_localcount;
+#endif
+
/*static*/
struct cdevsw crypto_cdevsw = {
.d_open = cryptoopen,
@@ -1122,6 +1127,9 @@ struct cdevsw crypto_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &crypto_localcount,
+#endif
.d_flag = D_OTHER
};
Index: src/sys/rump/librump/rumpvfs/devnull.c
diff -u src/sys/rump/librump/rumpvfs/devnull.c:1.7 src/sys/rump/librump/rumpvfs/devnull.c:1.7.2.1
--- src/sys/rump/librump/rumpvfs/devnull.c:1.7 Tue Jan 26 23:12:18 2016
+++ src/sys/rump/librump/rumpvfs/devnull.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: devnull.c,v 1.7 2016/01/26 23:12:18 pooka Exp $ */
+/* $NetBSD: devnull.c,v 1.7.2.1 2016/07/18 03:50:00 pgoyette Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -33,18 +33,23 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: devnull.c,v 1.7 2016/01/26 23:12:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: devnull.c,v 1.7.2.1 2016/07/18 03:50:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/stat.h>
+#include <sys/localcount.h>
#include <rump-sys/vfs.h>
static dev_type_open(rump_devnullopen);
static dev_type_read(rump_devnullrw);
+#ifdef _MODULE
+struct localcount null_localcount;
+#endif
+
static struct cdevsw null_cdevsw = {
.d_open = rump_devnullopen,
.d_close = nullclose,
@@ -57,6 +62,9 @@ static struct cdevsw null_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &null_localcount,
+#endif
.d_flag = D_OTHER | D_MPSAFE
};
Index: src/sys/rump/librump/rumpvfs/rumpblk.c
diff -u src/sys/rump/librump/rumpvfs/rumpblk.c:1.64 src/sys/rump/librump/rumpvfs/rumpblk.c:1.64.2.1
--- src/sys/rump/librump/rumpvfs/rumpblk.c:1.64 Thu Jul 7 06:55:44 2016
+++ src/sys/rump/librump/rumpvfs/rumpblk.c Mon Jul 18 03:50:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpblk.c,v 1.64 2016/07/07 06:55:44 msaitoh Exp $ */
+/* $NetBSD: rumpblk.c,v 1.64.2.1 2016/07/18 03:50:00 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 2016/07/07 06:55:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.64.2.1 2016/07/18 03:50:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v
#include <sys/queue.h>
#include <sys/stat.h>
#include <sys/cprng.h>
+#include <sys/localcount.h>
#include <rump-sys/kern.h>
#include <rump-sys/vfs.h>
@@ -94,6 +95,10 @@ dev_type_strategy(rumpblk_strategy_fail)
dev_type_dump(rumpblk_dump);
dev_type_size(rumpblk_size);
+#ifdef _MODULE
+struct localcount rumpblk_b_localcount, rumpblk_c_localcount;
+#endif
+
static const struct bdevsw rumpblk_bdevsw = {
.d_open = rumpblk_open,
.d_close = rumpblk_close,
@@ -102,6 +107,9 @@ static const struct bdevsw rumpblk_bdevs
.d_dump = nodump,
.d_psize = nosize,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &rumpblk_b_localcount,
+#endif
.d_flag = D_DISK
};
@@ -113,6 +121,9 @@ static const struct bdevsw rumpblk_bdevs
.d_dump = nodump,
.d_psize = nosize,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &rumpblk_b_localcount,
+#endif
.d_flag = D_DISK
};
@@ -128,6 +139,9 @@ static const struct cdevsw rumpblk_cdevs
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &rumpblk_c_localcount,
+#endif
.d_flag = D_DISK
};
