Module Name: src
Committed By: christos
Date: Thu Aug 20 14:40:19 UTC 2015
Modified Files:
src/sys/arch/amiga/dev: view.c
src/sys/arch/atari/dev: view.c
src/sys/arch/i386/isa: cmos.c
src/sys/arch/luna68k/dev: siotty.c
src/sys/arch/mac68k/dev: grf_compat.c ite_compat.c
src/sys/arch/x68k/dev: opmbell.c
src/sys/arch/xen/xen: xenevt.c
src/sys/coda: coda_psdev.c
src/sys/dev: bio.c ccd.c cgd.c fss.c kttcp.c lockstat.c md.c
rndpseudo.c sequencer.c vnd.c
src/sys/dev/ata: ata_raid.c
src/sys/dev/bluetooth: bcsp.c btuart.c
src/sys/dev/dm: device-mapper.c
src/sys/dev/dmover: dmover_io.c swdmover.c
src/sys/dev/filemon: filemon.c
src/sys/dev/gpio: gpiosim.c
src/sys/dev/hpc: biconsdev.c
src/sys/dev/ir: irframe_tty.c
src/sys/dev/isa: weasel_isa.c
src/sys/dev/iscsi: iscsi_main.c
src/sys/dev/nand: nandemulator.c
src/sys/dev/raidframe: rf_netbsdkintf.c
src/sys/dev/tprof: tprof.c
src/sys/dev/wscons: wsmux.c
src/sys/dev/wsfont: wsfontdev.c
src/sys/dist/pf/net: if_pflog.c if_pfsync.c pf_ioctl.c
src/sys/net: if_bridge.c if_etherip.c if_faith.c if_gif.c if_gre.c
if_mpls.c if_pppoe.c if_spppsubr.c if_stf.c if_tap.c if_tun.c
if_vlan.c
src/sys/net/agr: if_agr.c
src/sys/net/npf: npf.c
src/sys/netinet: accf_data.c accf_http.c ip_carp.c
src/sys/netsmb: smb_dev.c
src/sys/opencrypto: cryptodev.c cryptosoft.c
Log Message:
include "ioconf.h" to get the 'void <driver>attach(int count);' prototype.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/dev/view.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/atari/dev/view.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/isa/cmos.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/luna68k/dev/siotty.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mac68k/dev/grf_compat.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mac68k/dev/ite_compat.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x68k/dev/opmbell.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/xen/xen/xenevt.c
cvs rdiff -u -r1.55 -r1.56 src/sys/coda/coda_psdev.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/bio.c
cvs rdiff -u -r1.164 -r1.165 src/sys/dev/ccd.c
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/cgd.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/fss.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/kttcp.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/lockstat.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/md.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/sequencer.c
cvs rdiff -u -r1.247 -r1.248 src/sys/dev/vnd.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ata/ata_raid.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/bluetooth/bcsp.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/bluetooth/btuart.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/dmover/dmover_io.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/dmover/swdmover.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/filemon/filemon.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/gpio/gpiosim.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/hpc/biconsdev.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/ir/irframe_tty.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/weasel_isa.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/nand/nandemulator.c
cvs rdiff -u -r1.324 -r1.325 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/tprof/tprof.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/wscons/wsmux.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/wsfont/wsfontdev.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dist/pf/net/if_pflog.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dist/pf/net/if_pfsync.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -u -r1.100 -r1.101 src/sys/net/if_bridge.c
cvs rdiff -u -r1.35 -r1.36 src/sys/net/if_etherip.c
cvs rdiff -u -r1.50 -r1.51 src/sys/net/if_faith.c
cvs rdiff -u -r1.86 -r1.87 src/sys/net/if_gif.c
cvs rdiff -u -r1.165 -r1.166 src/sys/net/if_gre.c
cvs rdiff -u -r1.17 -r1.18 src/sys/net/if_mpls.c
cvs rdiff -u -r1.102 -r1.103 src/sys/net/if_pppoe.c
cvs rdiff -u -r1.134 -r1.135 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.80 -r1.81 src/sys/net/if_stf.c
cvs rdiff -u -r1.81 -r1.82 src/sys/net/if_tap.c src/sys/net/if_vlan.c
cvs rdiff -u -r1.121 -r1.122 src/sys/net/if_tun.c
cvs rdiff -u -r1.31 -r1.32 src/sys/net/agr/if_agr.c
cvs rdiff -u -r1.22 -r1.23 src/sys/net/npf/npf.c
cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/accf_data.c
cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/accf_http.c
cvs rdiff -u -r1.60 -r1.61 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.43 -r1.44 src/sys/netsmb/smb_dev.c
cvs rdiff -u -r1.83 -r1.84 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.46 -r1.47 src/sys/opencrypto/cryptosoft.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/arch/amiga/dev/view.c
diff -u src/sys/arch/amiga/dev/view.c:1.31 src/sys/arch/amiga/dev/view.c:1.32
--- src/sys/arch/amiga/dev/view.c:1.31 Fri Jul 25 04:10:31 2014
+++ src/sys/arch/amiga/dev/view.c Thu Aug 20 10:40:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.31 2014/07/25 08:10:31 dholland Exp $ */
+/* $NetBSD: view.c,v 1.32 2015/08/20 14:40:16 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
* a interface to graphics. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.31 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.32 2015/08/20 14:40:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: view.c,v 1.3
#include <amiga/dev/viewvar.h>
#include "view.h"
+#include "ioconf.h"
static void view_display(struct view_softc *);
static void view_remove(struct view_softc *);
@@ -63,8 +64,6 @@ static int view_setsize(struct view_soft
int view_get_colormap(struct view_softc *, colormap_t *);
int view_set_colormap(struct view_softc *, colormap_t *);
-void viewattach(int);
-
struct view_softc views[NVIEW];
int view_inited; /* also checked in ite_cc.c */
Index: src/sys/arch/atari/dev/view.c
diff -u src/sys/arch/atari/dev/view.c:1.34 src/sys/arch/atari/dev/view.c:1.35
--- src/sys/arch/atari/dev/view.c:1.34 Fri Jul 25 04:10:32 2014
+++ src/sys/arch/atari/dev/view.c Thu Aug 20 10:40:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.34 2014/07/25 08:10:32 dholland Exp $ */
+/* $NetBSD: view.c,v 1.35 2015/08/20 14:40:16 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
* a interface to graphics. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.34 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.35 2015/08/20 14:40:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: view.c,v 1.3
#include <atari/dev/grfabs_reg.h>
#include <atari/dev/viewioctl.h>
#include <atari/dev/viewvar.h>
+
#include "view.h"
+#include "ioconf.h"
static void view_display(struct view_softc *);
static void view_remove(struct view_softc *);
@@ -93,8 +95,6 @@ const struct cdevsw view_cdevsw = {
/*
* functions for probeing.
*/
-void viewattach(int);
-
void
viewattach(int cnt)
{
Index: src/sys/arch/i386/isa/cmos.c
diff -u src/sys/arch/i386/isa/cmos.c:1.11 src/sys/arch/i386/isa/cmos.c:1.12
--- src/sys/arch/i386/isa/cmos.c:1.11 Fri Jul 25 04:10:33 2014
+++ src/sys/arch/i386/isa/cmos.c Thu Aug 20 10:40:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cmos.c,v 1.11 2014/07/25 08:10:33 dholland Exp $ */
+/* $NetBSD: cmos.c,v 1.12 2015/08/20 14:40:16 christos Exp $ */
/*
* Copyright (C) 2003 JONE System Co., Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.11 2014/07/25 08:10:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.12 2015/08/20 14:40:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,6 +79,8 @@ __KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.1
#include <dev/ic/mc146818reg.h>
#include <i386/isa/nvram.h>
+#include "ioconf.h"
+
#define CMOS_SUM 32
#define CMOS_BIOSSPEC 34 /* start of BIOS-specific configuration data */
@@ -87,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.1
#define CMOS_SIZE NVRAM_BIOSSPEC
-void cmosattach(int);
dev_type_open(cmos_open);
dev_type_read(cmos_read);
dev_type_write(cmos_write);
Index: src/sys/arch/luna68k/dev/siotty.c
diff -u src/sys/arch/luna68k/dev/siotty.c:1.42 src/sys/arch/luna68k/dev/siotty.c:1.43
--- src/sys/arch/luna68k/dev/siotty.c:1.42 Fri Jul 25 04:10:33 2014
+++ src/sys/arch/luna68k/dev/siotty.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.42 2014/07/25 08:10:33 dholland Exp $ */
+/* $NetBSD: siotty.c,v 1.43 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.42 2014/07/25 08:10:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.43 2015/08/20 14:40:17 christos Exp $");
#include "opt_ddb.h"
@@ -693,7 +693,6 @@ getsiocsr(struct sioreg *sio)
/*--------------------- console interface ----------------------*/
-void syscnattach(int);
int syscngetc(dev_t);
void syscnputc(dev_t, int);
Index: src/sys/arch/mac68k/dev/grf_compat.c
diff -u src/sys/arch/mac68k/dev/grf_compat.c:1.27 src/sys/arch/mac68k/dev/grf_compat.c:1.28
--- src/sys/arch/mac68k/dev/grf_compat.c:1.27 Sun Dec 14 18:48:58 2014
+++ src/sys/arch/mac68k/dev/grf_compat.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_compat.c,v 1.27 2014/12/14 23:48:58 chs Exp $ */
+/* $NetBSD: grf_compat.c,v 1.28 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (C) 1999 Scott Reynolds
@@ -34,7 +34,7 @@
#include "opt_grf_compat.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_compat.c,v 1.27 2014/12/14 23:48:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_compat.c,v 1.28 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,6 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: grf_compat.c
#include <uvm/uvm_extern.h>
+#include "ioconf.h"
+
dev_type_open(grfopen);
dev_type_close(grfclose);
dev_type_ioctl(grfioctl);
@@ -79,7 +81,6 @@ const struct cdevsw grf_cdevsw = {
void grf_scinit(struct grf_softc *, const char *, int);
void grf_init(int);
-void grfattach(int);
int grfmap(dev_t, struct macfb_softc *, void **, struct proc *);
int grfunmap(dev_t, struct macfb_softc *, void *, struct proc *);
Index: src/sys/arch/mac68k/dev/ite_compat.c
diff -u src/sys/arch/mac68k/dev/ite_compat.c:1.12 src/sys/arch/mac68k/dev/ite_compat.c:1.13
--- src/sys/arch/mac68k/dev/ite_compat.c:1.12 Fri Jul 25 04:10:33 2014
+++ src/sys/arch/mac68k/dev/ite_compat.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_compat.c,v 1.12 2014/07/25 08:10:33 dholland Exp $ */
+/* $NetBSD: ite_compat.c,v 1.13 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (C) 2000 Scott Reynolds
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_compat.c,v 1.12 2014/07/25 08:10:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_compat.c,v 1.13 2015/08/20 14:40:17 christos Exp $");
#include "ite.h"
#include "wsdisplay.h"
@@ -53,6 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: ite_compat.c
#include <machine/cpu.h>
#include <machine/iteioctl.h>
+#include "ioconf.h"
+
dev_type_open(iteopen);
dev_type_close(iteclose);
dev_type_read(iteread);
@@ -81,8 +83,6 @@ const struct cdevsw ite_cdevsw = {
extern const struct cdevsw wsdisplay_cdevsw;
#endif
-void iteattach(int);
-
static int ite_initted = 0;
static int ite_bell_freq = 1880;
static int ite_bell_length = 10;
Index: src/sys/arch/x68k/dev/opmbell.c
diff -u src/sys/arch/x68k/dev/opmbell.c:1.25 src/sys/arch/x68k/dev/opmbell.c:1.26
--- src/sys/arch/x68k/dev/opmbell.c:1.25 Fri Jul 25 04:10:35 2014
+++ src/sys/arch/x68k/dev/opmbell.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: opmbell.c,v 1.25 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: opmbell.c,v 1.26 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 1995 MINOURA Makoto, Takuya Harakawa.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opmbell.c,v 1.25 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opmbell.c,v 1.26 2015/08/20 14:40:17 christos Exp $");
#include "bell.h"
#if NBELL > 0
@@ -65,6 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: opmbell.c,v
#include <x68k/dev/opmvar.h>
+#include "ioconfig.h"
+
/* In opm.c. */
void opm_set_volume(int, int);
void opm_set_key(int, int);
@@ -110,8 +112,6 @@ void opm_bell_off(void);
int opm_bell_setup(struct bell_info *);
int bellmstohz(int);
-void bellattach(int);
-
dev_type_open(bellopen);
dev_type_close(bellclose);
dev_type_ioctl(bellioctl);
Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.43 src/sys/arch/xen/xen/xenevt.c:1.44
--- src/sys/arch/xen/xen/xenevt.c:1.43 Sat May 30 15:14:46 2015
+++ src/sys/arch/xen/xen/xenevt.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.43 2015/05/30 19:14:46 joerg Exp $ */
+/* $NetBSD: xenevt.c,v 1.44 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.43 2015/05/30 19:14:46 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.44 2015/08/20 14:40:17 christos Exp $");
#include "opt_xen.h"
#include <sys/param.h>
@@ -52,6 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1
#include <xen/xenio3.h>
#include <xen/xen.h>
+#include "ioconf.h"
+
/*
* Interface between the event channel and userland.
* Each process with a xenevt device instance open can regiter events it
@@ -62,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1
* Processes get a device instance by opening a cloning device.
*/
-void xenevtattach(int);
static int xenevt_fread(struct file *, off_t *, struct uio *,
kauth_cred_t, int);
static int xenevt_fwrite(struct file *, off_t *, struct uio *,
Index: src/sys/coda/coda_psdev.c
diff -u src/sys/coda/coda_psdev.c:1.55 src/sys/coda/coda_psdev.c:1.56
--- src/sys/coda/coda_psdev.c:1.55 Wed May 6 11:57:08 2015
+++ src/sys/coda/coda_psdev.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_psdev.c,v 1.55 2015/05/06 15:57:08 hannken Exp $ */
+/* $NetBSD: coda_psdev.c,v 1.56 2015/08/20 14:40:17 christos 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.55 2015/05/06 15:57:08 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.56 2015/08/20 14:40:17 christos Exp $");
extern int coda_nc_initialized; /* Set if cache has been initialized */
@@ -77,6 +77,8 @@ extern int coda_nc_initialized; /* Se
#include <coda/coda_namecache.h>
#include <coda/coda_io.h>
+#include "ioconf.h"
+
#define CTL_C
int coda_psdev_print_entry = 0;
@@ -92,8 +94,6 @@ int coda_kernel_version = CODA_KERNEL_VE
#define ENTRY if(coda_psdev_print_entry) myprintf(("Entered %s\n",__func__))
-void vcodaattach(int n);
-
dev_type_open(vc_nb_open);
dev_type_close(vc_nb_close);
dev_type_read(vc_nb_read);
Index: src/sys/dev/bio.c
diff -u src/sys/dev/bio.c:1.12 src/sys/dev/bio.c:1.13
--- src/sys/dev/bio.c:1.12 Thu Mar 12 11:33:10 2015
+++ src/sys/dev/bio.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.12 2015/03/12 15:33:10 christos Exp $ */
+/* $NetBSD: bio.c,v 1.13 2015/08/20 14:40:17 christos Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/*
@@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.12 2015/03/12 15:33:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13 2015/08/20 14:40:17 christos Exp $");
#include "opt_compat_netbsd.h"
@@ -47,6 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.12
#include <dev/biovar.h>
#include <dev/sysmon/sysmonvar.h>
+#include "ioconf.h"
+
struct bio_mapping {
LIST_ENTRY(bio_mapping) bm_link;
device_t bm_dev;
@@ -66,8 +68,6 @@ static int bio_delegate_ioctl(void *, u_
static struct bio_mapping *bio_lookup(char *);
static int bio_validate(void *);
-void bioattach(int);
-
const struct cdevsw bio_cdevsw = {
.d_open = bioopen,
.d_close = bioclose,
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.164 src/sys/dev/ccd.c:1.165
--- src/sys/dev/ccd.c:1.164 Tue Jul 21 17:42:15 2015
+++ src/sys/dev/ccd.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.164 2015/07/21 21:42:15 skrll Exp $ */
+/* $NetBSD: ccd.c,v 1.165 2015/08/20 14:40:17 christos 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.164 2015/07/21 21:42:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.165 2015/08/20 14:40:17 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -127,6 +127,8 @@ __KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.16
#include <miscfs/specfs/specdev.h> /* for v_rdev */
+#include "ioconf.h"
+
#if defined(CCDDEBUG) && !defined(DEBUG)
#define DEBUG
#endif
@@ -160,7 +162,6 @@ static pool_cache_t ccd_cache;
(MAKEDISKDEV(major((dev)), ccdunit((dev)), RAW_PART))
/* called by main() at boot time */
-void ccdattach(int);
void ccddetach(void);
/* called by biodone() at interrupt time */
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.101 src/sys/dev/cgd.c:1.102
--- src/sys/dev/cgd.c:1.101 Wed Aug 19 16:15:20 2015
+++ src/sys/dev/cgd.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.101 2015/08/19 20:15:20 mlelstv Exp $ */
+/* $NetBSD: cgd.c,v 1.102 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.101 2015/08/19 20:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.102 2015/08/20 14:40:17 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -57,9 +57,9 @@ __KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.10
#include <miscfs/specfs/specdev.h> /* for v_rdev */
-/* Entry Point Functions */
+#include "ioconf.h"
-void cgdattach(int);
+/* Entry Point Functions */
static dev_type_open(cgdopen);
static dev_type_close(cgdclose);
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.92 src/sys/dev/fss.c:1.93
--- src/sys/dev/fss.c:1.92 Thu Oct 2 18:05:38 2014
+++ src/sys/dev/fss.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.92 2014/10/02 22:05:38 justin Exp $ */
+/* $NetBSD: fss.c,v 1.93 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.92 2014/10/02 22:05:38 justin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.93 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.92
#include <uvm/uvm.h>
-void fssattach(int);
+#include "ioconf.h"
dev_type_open(fss_open);
dev_type_close(fss_close);
Index: src/sys/dev/kttcp.c
diff -u src/sys/dev/kttcp.c:1.37 src/sys/dev/kttcp.c:1.38
--- src/sys/dev/kttcp.c:1.37 Thu Aug 7 23:05:44 2014
+++ src/sys/dev/kttcp.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.37 2014/08/08 03:05:44 rtr Exp $ */
+/* $NetBSD: kttcp.c,v 1.38 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.37 2014/08/08 03:05:44 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.38 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -63,6 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.
#include <dev/kttcpio.h>
+#include "ioconf.h"
+
static int kttcp_send(struct lwp *l, struct kttcp_io_args *);
static int kttcp_recv(struct lwp *l, struct kttcp_io_args *);
static int kttcp_sosend(struct socket *, unsigned long long,
@@ -70,8 +72,6 @@ static int kttcp_sosend(struct socket *,
static int kttcp_soreceive(struct socket *, unsigned long long,
unsigned long long *, struct lwp *, int *);
-void kttcpattach(int);
-
dev_type_ioctl(kttcpioctl);
const struct cdevsw kttcp_cdevsw = {
Index: src/sys/dev/lockstat.c
diff -u src/sys/dev/lockstat.c:1.23 src/sys/dev/lockstat.c:1.24
--- src/sys/dev/lockstat.c:1.23 Sun Jun 7 02:08:37 2015
+++ src/sys/dev/lockstat.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.23 2015/06/07 06:08:37 matt Exp $ */
+/* $NetBSD: lockstat.c,v 1.24 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.23 2015/06/07 06:08:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.24 2015/08/20 14:40:17 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -58,6 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: lockstat.c,v
#include <machine/lock.h>
+#include "ioconf.h"
+
#ifndef __HAVE_CPU_COUNTER
#error CPU counters not available
#endif
@@ -85,7 +87,6 @@ typedef struct lscpu {
typedef struct lslist lslist_t;
-void lockstatattach(int);
void lockstat_start(lsenable_t *);
int lockstat_alloc(lsenable_t *);
void lockstat_init_tables(lsenable_t *);
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.74 src/sys/dev/md.c:1.75
--- src/sys/dev/md.c:1.74 Sun Apr 26 11:15:20 2015
+++ src/sys/dev/md.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.74 2015/04/26 15:15:20 mlelstv Exp $ */
+/* $NetBSD: md.c,v 1.75 2015/08/20 14:40:17 christos 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.74 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.75 2015/08/20 14:40:17 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -65,6 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: md.c,v 1.74
#include <dev/md.h>
+#include "ioconf.h"
/*
* The user-space functionality is included by default.
* Use `options MEMORY_DISK_SERVER=0' to turn it off.
@@ -93,8 +94,6 @@ struct md_softc {
#define sc_size sc_md.md_size
#define sc_type sc_md.md_type
-void mdattach(int);
-
static void md_attach(device_t, device_t, void *);
static int md_detach(device_t, int);
Index: src/sys/dev/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.34 src/sys/dev/rndpseudo.c:1.35
--- src/sys/dev/rndpseudo.c:1.34 Tue Apr 21 08:57:03 2015
+++ src/sys/dev/rndpseudo.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.34 2015/04/21 12:57:03 riastradh Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.35 2015/08/20 14:40:17 christos 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.34 2015/04/21 12:57:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.35 2015/08/20 14:40:17 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -65,6 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,
#include <dev/rnd_private.h>
+#include "ioconf.h"
+
#if defined(__HAVE_CPU_COUNTER)
#include <machine/cpu_counter.h>
#endif
@@ -104,8 +106,6 @@ static pool_cache_t rnd_ctx_cache __read
*/
static percpu_t *percpu_urandom_cprng __read_mostly;
-/* Used by ioconf.c to attach the rnd pseudo-device. */
-void rndattach(int);
dev_type_open(rndopen);
@@ -175,6 +175,7 @@ rndpseudo_counter(void)
}
/*
+ * Used by ioconf.c to attach the rnd pseudo-device.
* `Attach' the random device. We use the timing of this event as
* another potential source of initial entropy.
*/
Index: src/sys/dev/sequencer.c
diff -u src/sys/dev/sequencer.c:1.63 src/sys/dev/sequencer.c:1.64
--- src/sys/dev/sequencer.c:1.63 Tue Dec 30 02:39:15 2014
+++ src/sys/dev/sequencer.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.63 2014/12/30 07:39:15 mrg Exp $ */
+/* $NetBSD: sequencer.c,v 1.64 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.63 2014/12/30 07:39:15 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.64 2015/08/20 14:40:17 christos Exp $");
#include "sequencer.h"
@@ -85,6 +85,8 @@ __KERNEL_RCSID(0, "$NetBSD: sequencer.c,
#include <dev/midivar.h>
#include <dev/sequencervar.h>
+#include "ioconf.h"
+
#define ADDTIMEVAL(a, b) ( \
(a)->tv_sec += (b)->tv_sec, \
(a)->tv_usec += (b)->tv_usec, \
@@ -117,7 +119,6 @@ typedef union sequencer_pcqitem {
char qi_msg[4];
} sequencer_pcqitem_t;
-void sequencerattach(int);
static void seq_reset(struct sequencer_softc *);
static int seq_do_command(struct sequencer_softc *, seq_event_t *);
static int seq_do_chnvoice(struct sequencer_softc *, seq_event_t *);
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.247 src/sys/dev/vnd.c:1.248
--- src/sys/dev/vnd.c:1.247 Sun Aug 2 07:40:41 2015
+++ src/sys/dev/vnd.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.247 2015/08/02 11:40:41 mlelstv Exp $ */
+/* $NetBSD: vnd.c,v 1.248 2015/08/20 14:40:17 christos 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.247 2015/08/02 11:40:41 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.248 2015/08/20 14:40:17 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -127,6 +127,8 @@ __KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.24
#include <dev/dkvar.h>
#include <dev/vndvar.h>
+#include "ioconf.h"
+
#if defined(VNDDEBUG) && !defined(DEBUG)
#define DEBUG
#endif
@@ -156,8 +158,6 @@ struct vndxfer {
#define VND_MAXPENDING(vnd) ((vnd)->sc_maxactive * 4)
-/* called by main() at boot time */
-void vndattach(int);
static void vndclear(struct vnd_softc *, int);
static int vnddoclear(struct vnd_softc *, int, int, bool);
Index: src/sys/dev/ata/ata_raid.c
diff -u src/sys/dev/ata/ata_raid.c:1.35 src/sys/dev/ata/ata_raid.c:1.36
--- src/sys/dev/ata/ata_raid.c:1.35 Sat Oct 27 13:18:14 2012
+++ src/sys/dev/ata/ata_raid.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid.c,v 1.35 2012/10/27 17:18:14 chs Exp $ */
+/* $NetBSD: ata_raid.c,v 1.36 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.35 2012/10/27 17:18:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.36 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v
#include <dev/ata/ata_raidvar.h>
#include "locators.h"
+#include "ioconf.h"
#ifdef ATA_RAID_DEBUG
#define DPRINTF(x) printf x
@@ -71,8 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v
#define DPRINTF(x) /* nothing */
#endif
-void ataraidattach(int);
-
static int ataraid_match(device_t, cfdata_t, void *);
static void ataraid_attach(device_t, device_t, void *);
static int ataraid_print(void *, const char *);
Index: src/sys/dev/bluetooth/bcsp.c
diff -u src/sys/dev/bluetooth/bcsp.c:1.28 src/sys/dev/bluetooth/bcsp.c:1.29
--- src/sys/dev/bluetooth/bcsp.c:1.28 Fri May 8 07:47:53 2015
+++ src/sys/dev/bluetooth/bcsp.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcsp.c,v 1.28 2015/05/08 11:47:53 christos Exp $ */
+/* $NetBSD: bcsp.c,v 1.29 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.28 2015/05/08 11:47:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.29 2015/08/20 14:40:17 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -131,7 +131,6 @@ struct bcsp_softc {
#define BCSP_XMIT (1 << 0) /* transmit active */
#define BCSP_ENABLED (1 << 1) /* is enabled */
-void bcspattach(int);
static int bcsp_match(device_t, cfdata_t, void *);
static void bcsp_attach(device_t, device_t, void *);
static int bcsp_detach(device_t, int);
Index: src/sys/dev/bluetooth/btuart.c
diff -u src/sys/dev/bluetooth/btuart.c:1.27 src/sys/dev/bluetooth/btuart.c:1.28
--- src/sys/dev/bluetooth/btuart.c:1.27 Tue May 20 14:25:54 2014
+++ src/sys/dev/bluetooth/btuart.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: btuart.c,v 1.27 2014/05/20 18:25:54 rmind Exp $ */
+/* $NetBSD: btuart.c,v 1.28 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2006, 2007 KIYOHARA Takashi
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.27 2014/05/20 18:25:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.28 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -81,7 +81,6 @@ struct btuart_softc {
#define BTUART_RECV_SCO_DATA 5 /* sco packet data */
#define BTUART_RECV_EVENT_DATA 6 /* event packet data */
-void btuartattach(int);
static int btuart_match(device_t, cfdata_t, void *);
static void btuart_attach(device_t, device_t, void *);
static int btuart_detach(device_t, int);
Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.36 src/sys/dev/dm/device-mapper.c:1.37
--- src/sys/dev/dm/device-mapper.c:1.36 Wed Dec 31 03:24:50 2014
+++ src/sys/dev/dm/device-mapper.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.36 2014/12/31 08:24:50 mlelstv Exp $ */
+/* $NetBSD: device-mapper.c,v 1.37 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,6 +49,7 @@
#include "netbsd-dm.h"
#include "dm.h"
+#include "ioconf.h"
static dev_type_open(dmopen);
static dev_type_close(dmclose);
@@ -59,7 +60,6 @@ static dev_type_strategy(dmstrategy);
static dev_type_size(dmsize);
/* attach and detach routines */
-void dmattach(int);
#ifdef _MODULE
static int dmdestroy(void);
#endif
Index: src/sys/dev/dmover/dmover_io.c
diff -u src/sys/dev/dmover/dmover_io.c:1.43 src/sys/dev/dmover/dmover_io.c:1.44
--- src/sys/dev/dmover/dmover_io.c:1.43 Fri Jul 25 04:10:36 2014
+++ src/sys/dev/dmover/dmover_io.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_io.c,v 1.43 2014/07/25 08:10:36 dholland Exp $ */
+/* $NetBSD: dmover_io.c,v 1.44 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.43 2014/07/25 08:10:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.44 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -81,6 +81,8 @@ __KERNEL_RCSID(0, "$NetBSD: dmover_io.c,
#include <dev/dmover/dmovervar.h>
#include <dev/dmover/dmover_io.h>
+#include "ioconf.h"
+
struct dmio_usrreq_state {
union {
struct work u_work;
@@ -128,8 +130,6 @@ static void dmio_usrreq_fini1(struct wor
struct pool dmio_state_pool;
struct pool dmio_usrreq_state_pool;
-void dmoverioattach(int);
-
dev_type_open(dmoverioopen);
const struct cdevsw dmoverio_cdevsw = {
Index: src/sys/dev/dmover/swdmover.c
diff -u src/sys/dev/dmover/swdmover.c:1.12 src/sys/dev/dmover/swdmover.c:1.13
--- src/sys/dev/dmover/swdmover.c:1.12 Fri Jan 4 16:17:53 2008
+++ src/sys/dev/dmover/swdmover.c Thu Aug 20 10:40:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: swdmover.c,v 1.12 2008/01/04 21:17:53 ad Exp $ */
+/* $NetBSD: swdmover.c,v 1.13 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.12 2008/01/04 21:17:53 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.13 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/kthread.h>
@@ -58,6 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: swdmover.c,v
#include <dev/dmover/dmovervar.h>
+#include "ioconf.h"
+
struct swdmover_function {
void (*sdf_process)(struct dmover_request *);
};
@@ -66,8 +68,6 @@ static struct dmover_backend swdmover_ba
static struct lwp *swdmover_lwp;
static int swdmover_cv;
-void swdmoverattach(int);
-
/*
* swdmover_process:
*
Index: src/sys/dev/filemon/filemon.c
diff -u src/sys/dev/filemon/filemon.c:1.10 src/sys/dev/filemon/filemon.c:1.11
--- src/sys/dev/filemon/filemon.c:1.10 Sat May 30 15:14:46 2015
+++ src/sys/dev/filemon/filemon.c Thu Aug 20 10:40:17 2015
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.10 2015/05/30 19:14:46 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.11 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: filemon.c,v
#include <sys/kauth.h>
#include "filemon.h"
+#include "ioconf.h"
MODULE(MODULE_CLASS_DRIVER, filemon, NULL);
@@ -337,8 +338,6 @@ filemon_load(void *dummy __unused)
filemon_wrapper_install();
}
-void filemonattach(int);
-
/*
* If this gets called we are linked into the kernel
*/
Index: src/sys/dev/gpio/gpiosim.c
diff -u src/sys/dev/gpio/gpiosim.c:1.17 src/sys/dev/gpio/gpiosim.c:1.18
--- src/sys/dev/gpio/gpiosim.c:1.17 Thu Aug 20 08:09:22 2015
+++ src/sys/dev/gpio/gpiosim.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiosim.c,v 1.17 2015/08/20 12:09:22 uebayasi Exp $ */
+/* $NetBSD: gpiosim.c,v 1.18 2015/08/20 14:40:18 christos Exp $ */
/* $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $ */
/*
@@ -31,6 +31,7 @@
#include <dev/gpio/gpiovar.h>
#include "gpiosim.h"
+#include "ioconf.h"
#define GPIOSIM_NPINS 64
@@ -45,7 +46,6 @@ struct gpiosim_softc {
};
static int gpiosim_match(device_t, cfdata_t, void *);
-void gpiosimattach(int);
static void gpiosim_attach(device_t, device_t, void *);
static int gpiosim_detach(device_t, int);
static int gpiosim_sysctl(SYSCTLFN_PROTO);
Index: src/sys/dev/hpc/biconsdev.c
diff -u src/sys/dev/hpc/biconsdev.c:1.22 src/sys/dev/hpc/biconsdev.c:1.23
--- src/sys/dev/hpc/biconsdev.c:1.22 Fri Jul 25 04:10:37 2014
+++ src/sys/dev/hpc/biconsdev.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: biconsdev.c,v 1.22 2014/07/25 08:10:37 dholland Exp $ */
+/* $NetBSD: biconsdev.c,v 1.23 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.22 2014/07/25 08:10:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.23 2015/08/20 14:40:18 christos Exp $");
#include "biconsdev.h"
#include <sys/param.h>
@@ -83,8 +83,9 @@ __KERNEL_RCSID(0, "$NetBSD: biconsdev.c,
#include <dev/hpc/bicons.h>
#include <dev/hpc/biconsvar.h>
+#include "ioconf.h"
+
struct tty biconsdev_tty[NBICONSDEV];
-void biconsdevattach(int);
static void biconsdev_output(struct tty *);
dev_type_open(biconsdevopen);
Index: src/sys/dev/ir/irframe_tty.c
diff -u src/sys/dev/ir/irframe_tty.c:1.60 src/sys/dev/ir/irframe_tty.c:1.61
--- src/sys/dev/ir/irframe_tty.c:1.60 Sun Nov 16 11:20:00 2014
+++ src/sys/dev/ir/irframe_tty.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.60 2014/11/16 16:20:00 ozaki-r Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.61 2015/08/20 14:40:18 christos Exp $ */
/*
* TODO
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.60 2014/11/16 16:20:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.61 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -63,6 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: irframe_tty.
#include <dev/ir/irdaio.h>
#include <dev/ir/irframevar.h>
+#include "ioconf.h"
+
#ifdef IRFRAMET_DEBUG
#define DPRINTF(x) if (irframetdebug) printf x
int irframetdebug = 0;
@@ -124,8 +126,6 @@ int irframetioctl(struct tty *, u_long,
int irframetinput(int, struct tty *);
int irframetstart(struct tty *);
-/* pseudo device init */
-void irframettyattach(int);
/* irframe methods */
static int irframet_open(void *, int, int, struct lwp *);
Index: src/sys/dev/isa/weasel_isa.c
diff -u src/sys/dev/isa/weasel_isa.c:1.5 src/sys/dev/isa/weasel_isa.c:1.6
--- src/sys/dev/isa/weasel_isa.c:1.5 Tue Apr 8 16:08:50 2008
+++ src/sys/dev/isa/weasel_isa.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: weasel_isa.c,v 1.5 2008/04/08 20:08:50 cegger Exp $ */
+/* $NetBSD: weasel_isa.c,v 1.6 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.5 2008/04/08 20:08:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.6 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,14 +56,14 @@ __KERNEL_RCSID(0, "$NetBSD: weasel_isa.c
#include <dev/sysmon/sysmonvar.h>
+#include "ioconf.h"
+
int weasel_isa_wdog_setmode(struct sysmon_wdog *);
int weasel_isa_wdog_tickle(struct sysmon_wdog *);
int weasel_isa_wdog_arm_disarm(struct weasel_handle *, u_int8_t);
int weasel_isa_wdog_query_state(struct weasel_handle *);
-void pcweaselattach(int);
-
/* ARGSUSED */
void
pcweaselattach(int count)
Index: src/sys/dev/iscsi/iscsi_main.c
diff -u src/sys/dev/iscsi/iscsi_main.c:1.16 src/sys/dev/iscsi/iscsi_main.c:1.17
--- src/sys/dev/iscsi/iscsi_main.c:1.16 Sat May 30 16:09:47 2015
+++ src/sys/dev/iscsi/iscsi_main.c Thu Aug 20 10:40:18 2015
@@ -37,6 +37,7 @@
#include <sys/kmem.h>
#include <sys/socketvar.h>
+#include "ioconf.h"
/*------------------------- Global Variables ------------------------*/
@@ -73,8 +74,6 @@ login_isid_t iscsi_InitiatorISID;
System interface: autoconf and device structures
*/
-void iscsiattach(int);
-
static void iscsi_attach(device_t parent, device_t self, void *aux);
static int iscsi_match(device_t, cfdata_t, void *);
static int iscsi_detach(device_t, int);
Index: src/sys/dev/nand/nandemulator.c
diff -u src/sys/dev/nand/nandemulator.c:1.6 src/sys/dev/nand/nandemulator.c:1.7
--- src/sys/dev/nand/nandemulator.c:1.6 Sat Nov 3 08:45:28 2012
+++ src/sys/dev/nand/nandemulator.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nandemulator.c,v 1.6 2012/11/03 12:45:28 ahoka Exp $ */
+/* $NetBSD: nandemulator.c,v 1.7 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.6 2012/11/03 12:45:28 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.7 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -46,8 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: nandemulator
#include <dev/nand/onfi.h>
#include <dev/nand/nand_crc.h>
+#include "ioconf.h"
+
extern struct cfdriver nandemulator_cd;
-void nandemulatorattach(int n);
static int nandemulator_match(device_t, cfdata_t, void *);
static void nandemulator_attach(device_t, device_t, void *);
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.324 src/sys/dev/raidframe/rf_netbsdkintf.c:1.325
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.324 Fri Jul 10 05:49:56 2015
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.324 2015/07/10 09:49:56 mrg Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.325 2015/08/20 14:40:18 christos 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.324 2015/07/10 09:49:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.325 2015/08/20 14:40:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -151,6 +151,8 @@ __KERNEL_RCSID(0, "$NetBSD: rf_netbsdkin
#include "rf_compat50.h"
#endif
+#include "ioconf.h"
+
#ifdef DEBUG
int rf_kdebug_level = 0;
#define db1_printf(a) if (rf_kdebug_level > 0) printf a
@@ -179,7 +181,6 @@ static void InitBP(struct buf *, struct
struct raid_softc;
static void raidinit(struct raid_softc *);
-void raidattach(int);
static int raid_match(device_t, cfdata_t, void *);
static void raid_attach(device_t, device_t, void *);
static int raid_detach(device_t, int);
Index: src/sys/dev/tprof/tprof.c
diff -u src/sys/dev/tprof/tprof.c:1.12 src/sys/dev/tprof/tprof.c:1.13
--- src/sys/dev/tprof/tprof.c:1.12 Fri Jul 25 04:10:39 2014
+++ src/sys/dev/tprof/tprof.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.12 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: tprof.c,v 1.13 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c)2008,2009,2010 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.12 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.13 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,6 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.
#include <dev/tprof/tprof.h>
#include <dev/tprof/tprof_ioctl.h>
+#include "ioconf.h"
+
/*
* locking order:
* tprof_reader_lock -> tprof_lock
@@ -502,8 +504,6 @@ tprof_backend_unregister(const char *nam
/* -------------------- cdevsw interfaces */
-void tprofattach(int);
-
static int
tprof_open(dev_t dev, int flags, int type, struct lwp *l)
{
Index: src/sys/dev/wscons/wsmux.c
diff -u src/sys/dev/wscons/wsmux.c:1.58 src/sys/dev/wscons/wsmux.c:1.59
--- src/sys/dev/wscons/wsmux.c:1.58 Fri Jul 25 04:10:39 2014
+++ src/sys/dev/wscons/wsmux.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmux.c,v 1.58 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: wsmux.c,v 1.59 2015/08/20 14:40:18 christos Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.58 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.59 2015/08/20 14:40:18 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_modular.h"
@@ -70,6 +70,8 @@ __KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.
#include <dev/wscons/wscons_callbacks.h>
#include <dev/wscons/wsmuxvar.h>
+#include "ioconf.h"
+
#ifdef WSMUX_DEBUG
#define DPRINTF(x) if (wsmuxdebug) printf x
#define DPRINTFN(n,x) if (wsmuxdebug > (n)) printf x
@@ -111,8 +113,6 @@ static int wsmux_do_ioctl(device_t, u_lo
static int wsmux_add_mux(int, struct wsmux_softc *);
-void wsmuxattach(int);
-
#define WSMUXDEV(n) ((n) & 0x7f)
#define WSMUXCTL(n) ((n) & 0x80)
Index: src/sys/dev/wsfont/wsfontdev.c
diff -u src/sys/dev/wsfont/wsfontdev.c:1.16 src/sys/dev/wsfont/wsfontdev.c:1.17
--- src/sys/dev/wsfont/wsfontdev.c:1.16 Fri Jul 25 04:10:39 2014
+++ src/sys/dev/wsfont/wsfontdev.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfontdev.c,v 1.16 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: wsfontdev.c,v 1.17 2015/08/20 14:40:18 christos Exp $ */
/*
* Copyright (c) 2001
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.16 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.17 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,
#include <dev/wsfont/wsfont.h>
#include <dev/wscons/wsconsio.h> /* XXX */
-void wsfontattach(int);
+#include "ioconf.h"
static int wsfont_isopen;
Index: src/sys/dist/pf/net/if_pflog.c
diff -u src/sys/dist/pf/net/if_pflog.c:1.18 src/sys/dist/pf/net/if_pflog.c:1.19
--- src/sys/dist/pf/net/if_pflog.c:1.18 Mon Apr 12 09:57:38 2010
+++ src/sys/dist/pf/net/if_pflog.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pflog.c,v 1.18 2010/04/12 13:57:38 ahoka Exp $ */
+/* $NetBSD: if_pflog.c,v 1.19 2015/08/20 14:40:18 christos Exp $ */
/* $OpenBSD: if_pflog.c,v 1.24 2007/05/26 17:13:30 jason Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v 1.18 2010/04/12 13:57:38 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v 1.19 2015/08/20 14:40:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -73,6 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v
#include <net/pfvar.h>
#include <net/if_pflog.h>
+#include "ioconf.h"
+
#define PFLOGMTU (32768 + MHLEN + MLEN)
#ifdef PFLOGDEBUG
@@ -81,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v
#define DPRINTF(x)
#endif
-void pflogattach(int);
#ifdef _MODULE
void pflogdetach(void);
#endif /* _MODULE */
Index: src/sys/dist/pf/net/if_pfsync.c
diff -u src/sys/dist/pf/net/if_pfsync.c:1.10 src/sys/dist/pf/net/if_pfsync.c:1.11
--- src/sys/dist/pf/net/if_pfsync.c:1.10 Thu Mar 6 10:21:58 2014
+++ src/sys/dist/pf/net/if_pfsync.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pfsync.c,v 1.10 2014/03/06 15:21:58 nonaka Exp $ */
+/* $NetBSD: if_pfsync.c,v 1.11 2015/08/20 14:40:18 christos Exp $ */
/* $OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.10 2014/03/06 15:21:58 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.11 2015/08/20 14:40:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -85,6 +85,8 @@ extern int carp_suppress_preempt;
#include <net/net_stats.h>
+#include "ioconf.h"
+
percpu_t *pfsyncstat_percpu;
#define PFSYNC_STATINC(x) _NET_STATINC(pfsyncstat_percpu, x)
@@ -106,7 +108,6 @@ extern int ifqmaxlen; /* XXX */
struct pfsync_softc *pfsyncif = NULL;
-void pfsyncattach(int);
int pfsync_clone_create(struct if_clone *, int);
int pfsync_clone_destroy(struct ifnet *);
void pfsync_setmtu(struct pfsync_softc *, int);
Index: src/sys/dist/pf/net/pf_ioctl.c
diff -u src/sys/dist/pf/net/pf_ioctl.c:1.50 src/sys/dist/pf/net/pf_ioctl.c:1.51
--- src/sys/dist/pf/net/pf_ioctl.c:1.50 Fri Jul 25 04:10:39 2014
+++ src/sys/dist/pf/net/pf_ioctl.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_ioctl.c,v 1.50 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: pf_ioctl.c,v 1.51 2015/08/20 14:40:18 christos 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.50 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.51 2015/08/20 14:40:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -104,7 +104,8 @@ __KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v
#include <altq/altq.h>
#endif
-void pfattach(int);
+#include "ioconf.h"
+
#ifdef _MODULE
void pfdetach(void);
#endif /* _MODULE */
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.100 src/sys/net/if_bridge.c:1.101
--- src/sys/net/if_bridge.c:1.100 Thu Jul 23 06:52:34 2015
+++ src/sys/net/if_bridge.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.100 2015/07/23 10:52:34 ozaki-r Exp $ */
+/* $NetBSD: if_bridge.c,v 1.101 2015/08/20 14:40:19 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.100 2015/07/23 10:52:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.101 2015/08/20 14:40:19 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -143,6 +143,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_bridge.c,
#include <netinet/ip_carp.h>
#endif
+#include "ioconf.h"
+
__CTASSERT(sizeof(struct ifbifconf) == sizeof(struct ifbaconf));
__CTASSERT(offsetof(struct ifbifconf, ifbic_len) == offsetof(struct ifbaconf, ifbac_len));
__CTASSERT(offsetof(struct ifbifconf, ifbic_buf) == offsetof(struct ifbaconf, ifbac_buf));
@@ -217,8 +219,6 @@ int bridge_rtable_prune_period = BRIDGE_
static struct pool bridge_rtnode_pool;
static struct work bridge_rtage_wk;
-void bridgeattach(int);
-
static int bridge_clone_create(struct if_clone *, int);
static int bridge_clone_destroy(struct ifnet *);
Index: src/sys/net/if_etherip.c
diff -u src/sys/net/if_etherip.c:1.35 src/sys/net/if_etherip.c:1.36
--- src/sys/net/if_etherip.c:1.35 Tue Feb 25 13:30:12 2014
+++ src/sys/net/if_etherip.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_etherip.c,v 1.35 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: if_etherip.c,v 1.36 2015/08/20 14:40:19 christos Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <rosenf...@grumpf.hope-2000.org>
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.35 2014/02/25 18:30:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.36 2015/08/20 14:40:19 christos Exp $");
#include "opt_inet.h"
@@ -134,14 +134,14 @@ __KERNEL_RCSID(0, "$NetBSD: if_etherip.c
#include <compat/sys/sockio.h>
+#include "ioconf.h"
+
struct etherip_softc_list etherip_softc_list;
static int etherip_node;
static int etherip_sysctl_handler(SYSCTLFN_PROTO);
SYSCTL_SETUP_PROTO(sysctl_etherip_setup);
-void etheripattach(int);
-
static int etherip_match(device_t, cfdata_t, void *);
static void etherip_attach(device_t, device_t, void *);
static int etherip_detach(device_t, int);
Index: src/sys/net/if_faith.c
diff -u src/sys/net/if_faith.c:1.50 src/sys/net/if_faith.c:1.51
--- src/sys/net/if_faith.c:1.50 Mon Jul 28 21:35:44 2014
+++ src/sys/net/if_faith.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_faith.c,v 1.50 2014/07/29 01:35:44 ozaki-r Exp $ */
+/* $NetBSD: if_faith.c,v 1.51 2015/08/20 14:40:19 christos Exp $ */
/* $KAME: if_faith.c,v 1.21 2001/02/20 07:59:26 itojun Exp $ */
/*
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.50 2014/07/29 01:35:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.51 2015/08/20 14:40:19 christos Exp $");
#include "opt_inet.h"
@@ -82,14 +82,14 @@ __KERNEL_RCSID(0, "$NetBSD: if_faith.c,v
#include <net/net_osdep.h>
+#include "ioconf.h"
+
static int faithioctl(struct ifnet *, u_long, void *);
static int faithoutput(struct ifnet *, struct mbuf *,
const struct sockaddr *, struct rtentry *);
static void faithrtrequest(int, struct rtentry *,
const struct rt_addrinfo *);
-void faithattach(int);
-
static int faith_clone_create(struct if_clone *, int);
static int faith_clone_destroy(struct ifnet *);
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.86 src/sys/net/if_gif.c:1.87
--- src/sys/net/if_gif.c:1.86 Wed Jun 3 09:06:26 2015
+++ src/sys/net/if_gif.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.86 2015/06/03 13:06:26 martin Exp $ */
+/* $NetBSD: if_gif.c,v 1.87 2015/08/20 14:40:19 christos Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.86 2015/06/03 13:06:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.87 2015/08/20 14:40:19 christos Exp $");
#include "opt_inet.h"
@@ -79,10 +79,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1
#include <netinet/ip_encap.h>
#include <net/if_gif.h>
-
#include <net/net_osdep.h>
-void gifattach(int);
+#include "ioconf.h"
+
static void gifintr(void *);
/*
Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.165 src/sys/net/if_gre.c:1.166
--- src/sys/net/if_gre.c:1.165 Sat May 2 13:18:03 2015
+++ src/sys/net/if_gre.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.165 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: if_gre.c,v 1.166 2015/08/20 14:40:19 christos Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.165 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.166 2015/08/20 14:40:19 christos Exp $");
#include "opt_atalk.h"
#include "opt_gre.h"
@@ -114,6 +114,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1
#include <compat/sys/socket.h>
#include <compat/sys/sockio.h>
+
+#include "ioconf.h"
+
/*
* It is not easy to calculate the right value for a GRE MTU.
* We leave this task to the admin and use the same default that
@@ -1425,8 +1428,6 @@ out:
return error;
}
-void greattach(int);
-
/* ARGSUSED */
void
greattach(int count)
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.17 src/sys/net/if_mpls.c:1.18
--- src/sys/net/if_mpls.c:1.17 Thu Jun 4 05:19:59 2015
+++ src/sys/net/if_mpls.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.17 2015/06/04 09:19:59 ozaki-r Exp $ */
+/* $NetBSD: if_mpls.c,v 1.18 2015/08/20 14:40:19 christos Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.17 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.18 2015/08/20 14:40:19 christos Exp $");
#include "opt_inet.h"
#include "opt_mpls.h"
@@ -67,6 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v
#include "if_mpls.h"
+#include "ioconf.h"
+
#define TRIM_LABEL do { \
m_adj(m, sizeof(union mpls_shim)); \
if (m->m_len < sizeof(union mpls_shim) && \
@@ -76,8 +78,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v
} while (/* CONSTCOND */ 0)
-void ifmplsattach(int);
-
static int mpls_clone_create(struct if_clone *, int);
static int mpls_clone_destroy(struct ifnet *);
Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.102 src/sys/net/if_pppoe.c:1.103
--- src/sys/net/if_pppoe.c:1.102 Sat Oct 18 04:33:29 2014
+++ src/sys/net/if_pppoe.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.102 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.103 2015/08/20 14:40:19 christos Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.102 2014/10/18 08:33:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.103 2015/08/20 14:40:19 christos Exp $");
#include "pppoe.h"
#include "opt_pppoe.h"
@@ -57,6 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v
#include <net/bpf.h>
+#include "ioconf.h"
#undef PPPOE_DEBUG /* XXX - remove this or make it an option */
/* #define PPPOE_DEBUG 1 */
@@ -162,7 +163,6 @@ static void pppoe_dispatch_disc_pkt(stru
static void pppoe_data_input(struct mbuf *);
/* management routines */
-void pppoeattach(int);
static int pppoe_connect(struct pppoe_softc *);
static int pppoe_disconnect(struct pppoe_softc *);
static void pppoe_abort_connect(struct pppoe_softc *);
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.134 src/sys/net/if_spppsubr.c:1.135
--- src/sys/net/if_spppsubr.c:1.134 Mon May 25 04:29:01 2015
+++ src/sys/net/if_spppsubr.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.134 2015/05/25 08:29:01 ozaki-r Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.135 2015/08/20 14:40:19 christos Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.134 2015/05/25 08:29:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.135 2015/08/20 14:40:19 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -442,13 +442,6 @@ static const struct cp *cps[IDX_COUNT] =
};
-void spppattach(int);
-void
-/*ARGSUSED*/
-spppattach(int count)
-{
-}
-
/*
* Exported functions, comprising our interface to the lower layer.
*/
Index: src/sys/net/if_stf.c
diff -u src/sys/net/if_stf.c:1.80 src/sys/net/if_stf.c:1.81
--- src/sys/net/if_stf.c:1.80 Thu Jun 12 12:43:09 2014
+++ src/sys/net/if_stf.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stf.c,v 1.80 2014/06/12 16:43:09 christos Exp $ */
+/* $NetBSD: if_stf.c,v 1.81 2015/08/20 14:40:19 christos Exp $ */
/* $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */
/*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.80 2014/06/12 16:43:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.81 2015/08/20 14:40:19 christos Exp $");
#include "opt_inet.h"
#ifndef INET6
@@ -127,6 +127,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1
#include <net/if_gif.h>
#endif
+#include "ioconf.h"
+
#define IN6_IS_ADDR_6TO4(x) (ntohs((x)->s6_addr16[0]) == 0x2002)
#define GET_V4(x) ((const struct in_addr *)(&(x)->s6_addr16[1]))
@@ -166,8 +168,6 @@ static const struct protosw in_stf_proto
.pr_usrreqs = &rip_usrreqs,
};
-void stfattach(int);
-
static int stf_encapcheck(struct mbuf *, int, int, void *);
static struct in6_ifaddr *stf_getsrcifa6(struct ifnet *);
static int stf_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.81 src/sys/net/if_tap.c:1.82
--- src/sys/net/if_tap.c:1.81 Wed Dec 17 04:41:30 2014
+++ src/sys/net/if_tap.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.81 2014/12/17 09:41:30 ozaki-r Exp $ */
+/* $NetBSD: if_tap.c,v 1.82 2015/08/20 14:40:19 christos 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.81 2014/12/17 09:41:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.82 2015/08/20 14:40:19 christos Exp $");
#if defined(_KERNEL_OPT)
@@ -71,6 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1
#include <compat/sys/sockio.h>
+#include "ioconf.h"
+
#if defined(COMPAT_40) || defined(MODULAR)
/*
* sysctl node management
@@ -119,8 +121,6 @@ struct tap_softc {
/* autoconf(9) glue */
-void tapattach(int);
-
static int tap_match(device_t, cfdata_t, void *);
static void tap_attach(device_t, device_t, void *);
static int tap_detach(device_t, int);
Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.81 src/sys/net/if_vlan.c:1.82
--- src/sys/net/if_vlan.c:1.81 Sat Apr 18 14:32:16 2015
+++ src/sys/net/if_vlan.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.81 2015/04/18 18:32:16 ozaki-r Exp $ */
+/* $NetBSD: if_vlan.c,v 1.82 2015/08/20 14:40:19 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.81 2015/04/18 18:32:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.82 2015/08/20 14:40:19 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -111,6 +111,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v
#include <netinet6/in6_ifattach.h>
#endif
+#include "ioconf.h"
+
struct vlan_mc_entry {
LIST_ENTRY(vlan_mc_entry) mc_entries;
/*
@@ -179,8 +181,6 @@ static int vlan_ioctl(struct ifnet *, u_
static void vlan_start(struct ifnet *);
static void vlan_unconfig(struct ifnet *);
-void vlanattach(int);
-
/* XXX This should be a hash table with the tag as the basis of the key. */
static LIST_HEAD(, ifvlan) ifv_list;
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.121 src/sys/net/if_tun.c:1.122
--- src/sys/net/if_tun.c:1.121 Mon Apr 20 06:19:54 2015
+++ src/sys/net/if_tun.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.121 2015/04/20 10:19:54 roy Exp $ */
+/* $NetBSD: if_tun.c,v 1.122 2015/08/20 14:40:19 christos Exp $ */
/*
* Copyright (c) 1988, Julian Onions <j...@cs.nott.ac.uk>
@@ -15,7 +15,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.121 2015/04/20 10:19:54 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.122 2015/08/20 14:40:19 christos Exp $");
#include "opt_inet.h"
@@ -58,11 +58,12 @@ __KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1
#include <net/if_tun.h>
+#include "ioconf.h"
+
#define TUNDEBUG if (tundebug) printf
int tundebug = 0;
extern int ifqmaxlen;
-void tunattach(int);
static LIST_HEAD(, tun_softc) tun_softc_list;
static LIST_HEAD(, tun_softc) tunz_softc_list;
Index: src/sys/net/agr/if_agr.c
diff -u src/sys/net/agr/if_agr.c:1.31 src/sys/net/agr/if_agr.c:1.32
--- src/sys/net/agr/if_agr.c:1.31 Thu Sep 12 16:47:59 2013
+++ src/sys/net/agr/if_agr.c Thu Aug 20 10:40:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_agr.c,v 1.31 2013/09/12 20:47:59 martin Exp $ */
+/* $NetBSD: if_agr.c,v 1.32 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.31 2013/09/12 20:47:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.32 2015/08/20 14:40:18 christos Exp $");
#include "opt_inet.h"
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1
#include <net/agr/if_agrsubr.h>
#include <net/agr/if_agrethervar.h>
-void agrattach(int);
+#include "ioconf.h"
static int agr_clone_create(struct if_clone *, int);
static int agr_clone_destroy(struct ifnet *);
Index: src/sys/net/npf/npf.c
diff -u src/sys/net/npf/npf.c:1.22 src/sys/net/npf/npf.c:1.23
--- src/sys/net/npf/npf.c:1.22 Fri Jul 25 04:10:40 2014
+++ src/sys/net/npf/npf.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.22 2014/07/25 08:10:40 dholland Exp $ */
+/* $NetBSD: npf.c,v 1.23 2015/08/20 14:40:19 christos 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.22 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.23 2015/08/20 14:40:19 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -54,13 +54,13 @@ __KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.22
#include "npf_impl.h"
#include "npf_conn.h"
+#include "ioconf.h"
+
/*
* Module and device structures.
*/
MODULE(MODULE_CLASS_DRIVER, npf, NULL);
-void npfattach(int);
-
static int npf_fini(void);
static int npf_dev_open(dev_t, int, int, lwp_t *);
static int npf_dev_close(dev_t, int, int, lwp_t *);
Index: src/sys/netinet/accf_data.c
diff -u src/sys/netinet/accf_data.c:1.6 src/sys/netinet/accf_data.c:1.7
--- src/sys/netinet/accf_data.c:1.6 Wed Sep 2 10:56:57 2009
+++ src/sys/netinet/accf_data.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: accf_data.c,v 1.6 2009/09/02 14:56:57 tls Exp $ */
+/* $NetBSD: accf_data.c,v 1.7 2015/08/20 14:40:19 christos Exp $ */
/*-
* Copyright (c) 2000 Alfred Perlstein <alf...@freebsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: accf_data.c,v 1.6 2009/09/02 14:56:57 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: accf_data.c,v 1.7 2015/08/20 14:40:19 christos Exp $");
#define ACCEPT_FILTER_MOD
@@ -40,6 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: accf_data.c,
#include <netinet/accept_filter.h>
+#include "ioconf.h"
+
MODULE(MODULE_CLASS_MISC, accf_dataready, NULL);
/* accept filter that holds a socket until data arrives */
@@ -51,9 +53,6 @@ static struct accept_filter accf_data_fi
.accf_callback = sohasdata,
};
-/* XXX pseudo-device */
-void accf_dataattach(int);
-
void
accf_dataattach(int junk)
{
Index: src/sys/netinet/accf_http.c
diff -u src/sys/netinet/accf_http.c:1.8 src/sys/netinet/accf_http.c:1.9
--- src/sys/netinet/accf_http.c:1.8 Tue Feb 25 13:30:12 2014
+++ src/sys/netinet/accf_http.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: accf_http.c,v 1.8 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: accf_http.c,v 1.9 2015/08/20 14:40:19 christos Exp $ */
/*-
* Copyright (c) 2000 Paycounter, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: accf_http.c,v 1.8 2014/02/25 18:30:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: accf_http.c,v 1.9 2015/08/20 14:40:19 christos Exp $");
#define ACCEPT_FILTER_MOD
@@ -43,6 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: accf_http.c,
#include <netinet/accept_filter.h>
+#include "ioconf.h"
+
MODULE(MODULE_CLASS_MISC, accf_httpready, NULL);
/* check for GET/HEAD */
@@ -72,9 +74,6 @@ static struct accept_filter accf_http_fi
static int parse_http_version = 1;
-/* XXX pseudo-device */
-void accf_httpattach(int);
-
void
accf_httpattach(int junk)
{
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.60 src/sys/netinet/ip_carp.c:1.61
--- src/sys/netinet/ip_carp.c:1.60 Thu Feb 26 04:54:46 2015
+++ src/sys/netinet/ip_carp.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.60 2015/02/26 09:54:46 roy Exp $ */
+/* $NetBSD: ip_carp.c,v 1.61 2015/08/20 14:40:19 christos Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -31,7 +31,7 @@
#include "opt_mbuftrace.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.60 2015/02/26 09:54:46 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.61 2015/08/20 14:40:19 christos Exp $");
/*
* TODO:
@@ -100,6 +100,8 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v
#include <netinet/ip_carp.h>
+#include "ioconf.h"
+
struct carp_mc_entry {
LIST_ENTRY(carp_mc_entry) mc_entries;
union {
@@ -193,7 +195,6 @@ static int carp_hmac_verify(struct carp_
static void carp_setroute(struct carp_softc *, int);
static void carp_proto_input_c(struct mbuf *, struct carp_header *,
sa_family_t);
-void carpattach(int);
static void carpdetach(struct carp_softc *);
static int carp_prepare_ad(struct mbuf *, struct carp_softc *,
struct carp_header *);
Index: src/sys/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.43 src/sys/netsmb/smb_dev.c:1.44
--- src/sys/netsmb/smb_dev.c:1.43 Fri Sep 5 05:26:16 2014
+++ src/sys/netsmb/smb_dev.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.43 2014/09/05 09:26:16 matt Exp $ */
+/* $NetBSD: smb_dev.c,v 1.44 2015/08/20 14:40:19 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.43 2014/09/05 09:26:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.44 2015/08/20 14:40:19 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -68,6 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v
#include <netsmb/smb_dev.h>
#include <netsmb/smb_rq.h>
+#include "ioconf.h"
+
static struct smb_dev **smb_devtbl; /* indexed by minor */
#define SMB_GETDEV(dev) (smb_devtbl[minor(dev)])
#define NSMB_DEFNUM 4
@@ -100,7 +102,6 @@ const struct cdevsw nsmb_cdevsw = {
};
-void nsmbattach(int);
static bool nsmb_inited = false;
void
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.83 src/sys/opencrypto/cryptodev.c:1.84
--- src/sys/opencrypto/cryptodev.c:1.83 Thu Mar 26 13:40:16 2015
+++ src/sys/opencrypto/cryptodev.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.83 2015/03/26 17:40:16 prlw1 Exp $ */
+/* $NetBSD: cryptodev.c,v 1.84 2015/08/20 14:40:19 christos 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.83 2015/03/26 17:40:16 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.84 2015/08/20 14:40:19 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,6 +96,8 @@ __KERNEL_RCSID(0, "$NetBSD: cryptodev.c,
#include <opencrypto/cryptodev_internal.h>
#include <opencrypto/xform.h>
+#include "ioconf.h"
+
struct csession {
TAILQ_ENTRY(csession) next;
u_int64_t sid;
@@ -2080,8 +2082,6 @@ cryptof_poll(struct file *fp, int events
/*
* Pseudo-device initialization routine for /dev/crypto
*/
-void cryptoattach(int);
-
void
cryptoattach(int num)
{
Index: src/sys/opencrypto/cryptosoft.c
diff -u src/sys/opencrypto/cryptosoft.c:1.46 src/sys/opencrypto/cryptosoft.c:1.47
--- src/sys/opencrypto/cryptosoft.c:1.46 Wed Jul 2 14:58:42 2014
+++ src/sys/opencrypto/cryptosoft.c Thu Aug 20 10:40:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptosoft.c,v 1.46 2014/07/02 18:58:42 riastradh Exp $ */
+/* $NetBSD: cryptosoft.c,v 1.47 2015/08/20 14:40:19 christos Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.46 2014/07/02 18:58:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.47 2015/08/20 14:40:19 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,6 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: cryptosoft.c
#include <opencrypto/cryptosoft_xform.c>
+#include "ioconf.h"
+
union authctx {
MD5_CTX md5ctx;
SHA1_CTX sha1ctx;
@@ -1317,7 +1319,6 @@ swcr_init(void)
/*
* Pseudo-device init routine for software crypto.
*/
-void swcryptoattach(int);
void
swcryptoattach(int num)
