Module Name: src
Committed By: pgoyette
Date: Sat Apr 29 09:18:00 UTC 2017
Modified Files:
src/external/cddl/osnet/dev/fbt [prg-localcount2]: fbt.c
src/external/cddl/osnet/dev/sdt [prg-localcount2]: sdt.c
src/external/cddl/osnet/dist/uts/common/dtrace [prg-localcount2]:
dtrace.c
src/sys/coda [prg-localcount2]: coda_psdev.c
src/sys/dev [prg-localcount2]: ccd.c clockctl.c spkr.c
src/sys/dev/filemon [prg-localcount2]: filemon.c
src/sys/dev/flash [prg-localcount2]: flash.c
src/sys/dev/gpio [prg-localcount2]: gpio.c
src/sys/dev/hdaudio [prg-localcount2]: hdaudio.c
src/sys/dev/i2c [prg-localcount2]: i2c.c
src/sys/dev/onewire [prg-localcount2]: onewire.c
src/sys/dev/tprof [prg-localcount2]: tprof.c
src/sys/dist/pf/net [prg-localcount2]: pf_ioctl.c
src/sys/external/bsd/drm/dist/bsd-core [prg-localcount2]: drm_drv.c
src/sys/external/bsd/drm2/drm [prg-localcount2]: drm_drv.c
src/sys/external/bsd/ipf/netinet [prg-localcount2]: ip_fil_netbsd.c
src/sys/modules/lua [prg-localcount2]: lua.c
src/sys/net [prg-localcount2]: if_srt.c
Log Message:
Add DEVSW_MODULE_INIT to existing device-driver modules, so that they
willl have a localcount defined and thus be permitted to load. Without
a localcount, loading the module will return EINVAL.
XXX the dtrace and drm stuff might need to be fed back upstream?
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.2.1 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.18 -r1.18.4.1 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.35 -r1.35.4.1 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/coda/coda_psdev.c
cvs rdiff -u -r1.171 -r1.171.4.1 src/sys/dev/ccd.c
cvs rdiff -u -r1.35.6.1 -r1.35.6.2 src/sys/dev/clockctl.c
cvs rdiff -u -r1.6 -r1.6.10.1 src/sys/dev/spkr.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/dev/filemon/filemon.c
cvs rdiff -u -r1.12 -r1.12.18.1 src/sys/dev/flash/flash.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/gpio/gpio.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/hdaudio/hdaudio.c
cvs rdiff -u -r1.54 -r1.54.6.1 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.16 -r1.16.18.1 src/sys/dev/onewire/onewire.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/dev/tprof/tprof.c
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -u -r1.26 -r1.26.10.1 \
src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.22.4.1 -r1.22.4.2 \
src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/net/if_srt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.22 src/external/cddl/osnet/dev/fbt/fbt.c:1.22.2.1
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.22 Mon Feb 27 06:47:00 2017
+++ src/external/cddl/osnet/dev/fbt/fbt.c Sat Apr 29 09:17:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.22 2017/02/27 06:47:00 chs Exp $ */
+/* $NetBSD: fbt.c,v 1.22.2.1 2017/04/29 09:17:58 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -35,6 +35,9 @@
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
+#ifdef __NetBSD
+#include <sys/localcount.h>
+#endif
#include <sys/conf.h>
#include <sys/cpuvar.h>
#include <sys/fcntl.h>
@@ -152,6 +155,9 @@ static void fbt_resume(void *, dtrace_id
#define FBT_PROBETAB_SIZE 0x8000 /* 32k entries -- 128K total */
static const struct cdevsw fbt_cdevsw = {
+#ifdef __NetBSD__
+ DEVSW_MODULE_INIT
+#endif
.d_open = fbt_open,
.d_close = noclose,
.d_read = noread,
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.18 src/external/cddl/osnet/dev/sdt/sdt.c:1.18.4.1
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.18 Sat Jan 7 21:39:52 2017
+++ src/external/cddl/osnet/dev/sdt/sdt.c Sat Apr 29 09:17:58 2017
@@ -39,12 +39,15 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.18 2017/01/07 21:39:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.18.4.1 2017/04/29 09:17:58 pgoyette Exp $");
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
+#ifdef __NetBSD__
+#include <sys/localcount.h>
+#endif
#include <sys/conf.h>
#ifdef __FreeBSD__
#include <sys/eventhandler.h>
@@ -119,6 +122,9 @@ sdt_open(dev_t dev, int flags, int mode,
}
static const struct cdevsw sdt_cdevsw = {
+#ifdef __NetBSD__
+ DEVSW_MODULE_INIT
+#endif
.d_open = sdt_open,
.d_close = noclose,
.d_read = noread,
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.35 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.35.4.1
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.35 Sat Jan 7 21:39:53 2017
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sat Apr 29 09:17:58 2017
@@ -78,6 +78,9 @@
#include <sys/time.h>
#endif
#include <sys/stat.h>
+#ifdef __NetBSD__
+#include <sys/localcount.h>
+#endif
#include <sys/conf.h>
#include <sys/systm.h>
#if defined(sun)
@@ -15338,6 +15341,9 @@ static dev_type_open(dtrace_open);
/* Pseudo Device Entry points */
/* Just opens, clones to the fileops below */
const struct cdevsw dtrace_cdevsw = {
+#ifdef __NetBSD__
+ DEVSW_MODULE_INIT
+#endif
.d_open = dtrace_open,
.d_close = noclose,
.d_read = noread,
Index: src/sys/coda/coda_psdev.c
diff -u src/sys/coda/coda_psdev.c:1.57 src/sys/coda/coda_psdev.c:1.57.8.1
--- src/sys/coda/coda_psdev.c:1.57 Thu Jul 7 06:55:40 2016
+++ src/sys/coda/coda_psdev.c Sat Apr 29 09:17:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_psdev.c,v 1.57 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: coda_psdev.c,v 1.57.8.1 2017/04/29 09:17:58 pgoyette Exp $ */
/*
*
@@ -54,7 +54,7 @@
/* These routines are the device entry points for Venus. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.57 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.57.8.1 2017/04/29 09:17:58 pgoyette Exp $");
extern int coda_nc_initialized; /* Set if cache has been initialized */
@@ -68,6 +68,7 @@ extern int coda_nc_initialized; /* Se
#include <sys/ioctl.h>
#include <sys/poll.h>
#include <sys/select.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/atomic.h>
#include <sys/module.h>
@@ -103,6 +104,7 @@ dev_type_poll(vc_nb_poll);
dev_type_kqfilter(vc_nb_kqfilter);
const struct cdevsw vcoda_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = vc_nb_open,
.d_close = vc_nb_close,
.d_read = vc_nb_read,
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.171 src/sys/dev/ccd.c:1.171.4.1
--- src/sys/dev/ccd.c:1.171 Wed Apr 5 18:34:56 2017
+++ src/sys/dev/ccd.c Sat Apr 29 09:17:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.171 2017/04/05 18:34:56 jdolecek Exp $ */
+/* $NetBSD: ccd.c,v 1.171.4.1 2017/04/29 09:17:58 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.171 2017/04/05 18:34:56 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.171.4.1 2017/04/29 09:17:58 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -105,6 +105,7 @@ __KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.17
#include <sys/module.h>
#include <sys/namei.h>
#include <sys/stat.h>
+#include <sys/localcount.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>
#include <sys/device.h>
@@ -187,6 +188,7 @@ static dev_type_strategy(ccdstrategy);
static dev_type_size(ccdsize);
const struct bdevsw ccd_bdevsw = {
+ DEVSW_MODULE_INIT
.d_open = ccdopen,
.d_close = ccdclose,
.d_strategy = ccdstrategy,
@@ -198,6 +200,7 @@ const struct bdevsw ccd_bdevsw = {
};
const struct cdevsw ccd_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = ccdopen,
.d_close = ccdclose,
.d_read = ccdread,
Index: src/sys/dev/clockctl.c
diff -u src/sys/dev/clockctl.c:1.35.6.1 src/sys/dev/clockctl.c:1.35.6.2
--- src/sys/dev/clockctl.c:1.35.6.1 Thu Apr 27 05:36:35 2017
+++ src/sys/dev/clockctl.c Sat Apr 29 09:17:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.6.1 2017/04/27 05:36:35 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.6.2 2017/04/29 09:17:58 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.6.1 2017/04/27 05:36:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.6.2 2017/04/29 09:17:58 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -43,6 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: clockctl.c,v
#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
+#include <sys/localcount.h>
#include <sys/device.h>
#include <sys/time.h>
#include <sys/conf.h>
@@ -67,6 +68,7 @@ int clockctl_refcnt;
dev_type_ioctl(clockctlioctl);
const struct cdevsw clockctl_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = clockctlopen,
.d_close = clockctlclose,
.d_read = noread,
Index: src/sys/dev/spkr.c
diff -u src/sys/dev/spkr.c:1.6 src/sys/dev/spkr.c:1.6.10.1
--- src/sys/dev/spkr.c:1.6 Fri Jan 6 09:32:08 2017
+++ src/sys/dev/spkr.c Sat Apr 29 09:17:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.6 2017/01/06 09:32:08 pgoyette Exp $ */
+/* $NetBSD: spkr.c,v 1.6.10.1 2017/04/29 09:17:58 pgoyette Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,12 +43,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.6 2017/01/06 09:32:08 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.6.10.1 2017/04/29 09:17:58 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/errno.h>
+#include <sys/localcount.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/module.h>
@@ -68,6 +69,7 @@ dev_type_write(spkrwrite);
dev_type_ioctl(spkrioctl);
const struct cdevsw spkr_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = spkropen,
.d_close = spkrclose,
.d_read = noread,
Index: src/sys/dev/filemon/filemon.c
diff -u src/sys/dev/filemon/filemon.c:1.28 src/sys/dev/filemon/filemon.c:1.28.8.1
--- src/sys/dev/filemon/filemon.c:1.28 Mon Jan 11 01:37:36 2016
+++ src/sys/dev/filemon/filemon.c Sat Apr 29 09:17:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon.c,v 1.28 2016/01/11 01:37:36 pgoyette Exp $ */
+/* $NetBSD: filemon.c,v 1.28.8.1 2017/04/29 09:17:58 pgoyette Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
*
@@ -25,11 +25,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.28 2016/01/11 01:37:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.28.8.1 2017/04/29 09:17:58 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/module.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/filedesc.h>
@@ -52,6 +53,7 @@ MODULE(MODULE_CLASS_DRIVER, filemon, NUL
static dev_type_open(filemon_open);
struct cdevsw filemon_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = filemon_open,
.d_close = noclose,
.d_read = noread,
Index: src/sys/dev/flash/flash.c
diff -u src/sys/dev/flash/flash.c:1.12 src/sys/dev/flash/flash.c:1.12.18.1
--- src/sys/dev/flash/flash.c:1.12 Fri Jul 25 08:10:36 2014
+++ src/sys/dev/flash/flash.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.c,v 1.12 2014/07/25 08:10:36 dholland Exp $ */
+/* $NetBSD: flash.c,v 1.12.18.1 2017/04/29 09:17:59 pgoyette Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.12 2014/07/25 08:10:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.12.18.1 2017/04/29 09:17:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/device.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/kmem.h>
#include <sys/uio.h>
@@ -92,6 +93,7 @@ CFATTACH_DECL_NEW(flash, sizeof(struct f
* Block device's operation
*/
const struct bdevsw flash_bdevsw = {
+ DEVSW_MODULE_INIT
.d_open = flashopen,
.d_close = flashclose,
.d_strategy = flashstrategy,
@@ -106,6 +108,7 @@ const struct bdevsw flash_bdevsw = {
* Character device's operations
*/
const struct cdevsw flash_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = flashopen,
.d_close = flashclose,
.d_read = flashread,
Index: src/sys/dev/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.58 src/sys/dev/gpio/gpio.c:1.58.8.1
--- src/sys/dev/gpio/gpio.c:1.58 Wed May 11 18:33:40 2016
+++ src/sys/dev/gpio/gpio.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.58 2016/05/11 18:33:40 bouyer Exp $ */
+/* $NetBSD: gpio.c,v 1.58.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.58 2016/05/11 18:33:40 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.58.8.1 2017/04/29 09:17:59 pgoyette Exp $");
/*
* General Purpose Input/Output framework.
@@ -28,6 +28,7 @@ __KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.5
#include <sys/param.h>
#include <sys/callout.h>
#include <sys/systm.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/fcntl.h>
@@ -100,6 +101,7 @@ dev_type_ioctl(gpioioctl);
dev_type_ioctl(gpioioctl_locked);
const struct cdevsw gpio_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = gpioopen,
.d_close = gpioclose,
.d_read = noread,
Index: src/sys/dev/hdaudio/hdaudio.c
diff -u src/sys/dev/hdaudio/hdaudio.c:1.4 src/sys/dev/hdaudio/hdaudio.c:1.4.8.1
--- src/sys/dev/hdaudio/hdaudio.c:1.4 Wed Dec 23 12:45:06 2015
+++ src/sys/dev/hdaudio/hdaudio.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.4 2015/12/23 12:45:06 jmcneill Exp $ */
+/* $NetBSD: hdaudio.c,v 1.4.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -30,12 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.4 2015/12/23 12:45:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.4.8.1 2017/04/29 09:17:59 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/bus.h>
#include <sys/kmem.h>
@@ -59,6 +60,7 @@ dev_type_close(hdaudioclose);
dev_type_ioctl(hdaudioioctl);
const struct cdevsw hdaudio_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = hdaudioopen,
.d_close = hdaudioclose,
.d_read = noread,
Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.54 src/sys/dev/i2c/i2c.c:1.54.6.1
--- src/sys/dev/i2c/i2c.c:1.54 Sat Jul 23 18:00:01 2016
+++ src/sys/dev/i2c/i2c.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.54 2016/07/23 18:00:01 jakllsch Exp $ */
+/* $nETbsD: i2c.c,v 1.54 2016/07/23 18:00:01 jakllsch Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,12 +40,13 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.54 2016/07/23 18:00:01 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.54.6.1 2017/04/29 09:17:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/event.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/malloc.h>
#include <sys/kmem.h>
@@ -83,6 +84,7 @@ int iic_refcnt;
ONCE_DECL(iic_once);
const struct cdevsw iic_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = iic_open,
.d_close = iic_close,
.d_read = noread,
Index: src/sys/dev/onewire/onewire.c
diff -u src/sys/dev/onewire/onewire.c:1.16 src/sys/dev/onewire/onewire.c:1.16.18.1
--- src/sys/dev/onewire/onewire.c:1.16 Fri Jul 25 08:10:38 2014
+++ src/sys/dev/onewire/onewire.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: onewire.c,v 1.16 2014/07/25 08:10:38 dholland Exp $ */
+/* $NetBSD: onewire.c,v 1.16.18.1 2017/04/29 09:17:59 pgoyette Exp $ */
/* $OpenBSD: onewire.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.16 2014/07/25 08:10:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.16.18.1 2017/04/29 09:17:59 pgoyette Exp $");
/*
* 1-Wire bus driver.
@@ -26,6 +26,7 @@ __KERNEL_RCSID(0, "$NetBSD: onewire.c,v
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/kernel.h>
@@ -80,6 +81,7 @@ CFATTACH_DECL_NEW(onewire, sizeof(struct
onewire_match, onewire_attach, onewire_detach, onewire_activate);
const struct cdevsw onewire_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = noopen,
.d_close = noclose,
.d_read = noread,
Index: src/sys/dev/tprof/tprof.c
diff -u src/sys/dev/tprof/tprof.c:1.13 src/sys/dev/tprof/tprof.c:1.13.8.1
--- src/sys/dev/tprof/tprof.c:1.13 Thu Aug 20 14:40:18 2015
+++ src/sys/dev/tprof/tprof.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.13 2015/08/20 14:40:18 christos Exp $ */
+/* $NetBSD: tprof.c,v 1.13.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
/*-
* Copyright (c)2008,2009,2010 YAMAMOTO Takashi,
@@ -27,13 +27,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.13 2015/08/20 14:40:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.13.8.1 2017/04/29 09:17:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/cpu.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/callout.h>
#include <sys/kmem.h>
@@ -642,6 +643,7 @@ tprof_ioctl(dev_t dev, u_long cmd, void
}
const struct cdevsw tprof_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = tprof_open,
.d_close = tprof_close,
.d_read = tprof_read,
Index: src/sys/dist/pf/net/pf_ioctl.c
diff -u src/sys/dist/pf/net/pf_ioctl.c:1.51 src/sys/dist/pf/net/pf_ioctl.c:1.51.8.1
--- src/sys/dist/pf/net/pf_ioctl.c:1.51 Thu Aug 20 14:40:18 2015
+++ src/sys/dist/pf/net/pf_ioctl.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_ioctl.c,v 1.51 2015/08/20 14:40:18 christos Exp $ */
+/* $NetBSD: pf_ioctl.c,v 1.51.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.182 2007/06/24 11:17:13 mcbride Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.51 2015/08/20 14:40:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.51.8.1 2017/04/29 09:17:59 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -61,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v
#include <sys/rwlock.h>
#include <uvm/uvm_extern.h>
#ifdef __NetBSD__
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/lwp.h>
#include <sys/kauth.h>
@@ -170,6 +171,7 @@ void pf_rtlabel_copyout(struct pf_add
#ifdef __NetBSD__
const struct cdevsw pf_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = pfopen,
.d_close = pfclose,
.d_read = noread,
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.26 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.26.10.1
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.26 Mon Nov 10 16:32:21 2014
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sat Apr 29 09:17:59 2017
@@ -37,6 +37,7 @@
#if defined(__FreeBSD__)
#include <sys/limits.h>
#elif defined(__NetBSD__)
+#include <sys/localcount.h>
#include <sys/module.h>
#endif
#include "drmP.h"
@@ -304,6 +305,7 @@ devclass_t drm_devclass;
struct drm_device *drm_units[DRM_MAXUNITS];
struct cdevsw drm_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = drm_open,
.d_close = drm_close,
.d_read = drm_read,
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.17 src/sys/external/bsd/drm2/drm/drm_drv.c:1.17.8.1
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.17 Mon Nov 9 22:04:53 2015
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.17 2015/11/09 22:04:53 jmcneill Exp $ */
+/* $NetBSD: drm_drv.c,v 1.17.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,10 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.17 2015/11/09 22:04:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.17.8.1 2017/04/29 09:17:59 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/file.h>
@@ -221,6 +222,7 @@ static const struct drm_ioctl_desc drm_i
};
const struct cdevsw drm_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = drm_open,
.d_close = noclose,
.d_read = noread,
Index: src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.22.4.1 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.22.4.2
--- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.22.4.1 Thu Apr 27 05:36:36 2017
+++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.22.4.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.22.4.2 2017/04/29 09:17:59 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.22.4.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.22.4.2 2017/04/29 09:17:59 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";
@@ -23,6 +23,9 @@ static const char rcsid[] = "@(#)Id: ip_
#endif
#include <sys/param.h>
#if (NetBSD >= 199905) && !defined(IPFILTER_LKM)
+# if (__NetBSD_Version__ >= 799007100)
+# include <sys/localcount.h>
+# endif
# if (__NetBSD_Version__ >= 799003000)
# ifdef _KERNEL_OPT
# include "opt_ipsec.h"
@@ -141,7 +144,7 @@ static int ipfpoll(dev_t, int event
static void ipf_timer_func(void *ptr);
const struct cdevsw ipl_cdevsw = {
-#if (__NetBSD_Version__ >= 799007000)
+#if (__NetBSD_Version__ >= 799007100)
DEVSW_MODULE_INIT
#endif
.d_open = ipfopen,
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.20 src/sys/modules/lua/lua.c:1.20.2.1
--- src/sys/modules/lua/lua.c:1.20 Sun Apr 16 17:45:12 2017
+++ src/sys/modules/lua/lua.c Sat Apr 29 09:17:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.c,v 1.20 2017/04/16 17:45:12 riastradh Exp $ */
+/* $NetBSD: lua.c,v 1.20.2.1 2017/04/29 09:17:59 pgoyette Exp $ */
/*
* Copyright (c) 2014 by Lourival Vieira Neto <ln...@netbsd.org>.
@@ -33,6 +33,7 @@
#include <sys/param.h>
#include <sys/fcntl.h>
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/condvar.h>
#include <sys/device.h>
@@ -94,6 +95,7 @@ dev_type_close(luaclose);
dev_type_ioctl(luaioctl);
const struct cdevsw lua_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = luaopen,
.d_close = luaclose,
.d_read = noread,
Index: src/sys/net/if_srt.c
diff -u src/sys/net/if_srt.c:1.26 src/sys/net/if_srt.c:1.26.4.1
--- src/sys/net/if_srt.c:1.26 Tue Feb 14 03:05:06 2017
+++ src/sys/net/if_srt.c Sat Apr 29 09:17:59 2017
@@ -1,8 +1,8 @@
-/* $NetBSD: if_srt.c,v 1.26 2017/02/14 03:05:06 ozaki-r Exp $ */
+/* $NetBSD: if_srt.c,v 1.26.4.1 2017/04/29 09:17:59 pgoyette Exp $ */
/* This file is in the public domain. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.26 2017/02/14 03:05:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.26.4.1 2017/04/29 09:17:59 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -25,6 +25,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1
#include <sys/param.h> /* sys/mbuf.h */
#include <netinet/in_systm.h> /* netinet/ip.h */
+#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/mbuf.h>
#include <sys/errno.h>
@@ -526,6 +527,7 @@ srt_ioctl(dev_t dev, u_long cmd, void *d
}
const struct cdevsw srt_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = srt_open,
.d_close = srt_close,
.d_read = nullread,
