Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-localcount]: src/sys Rump drivers are always installed via devs...
details: https://anonhg.NetBSD.org/src/rev/6358bf9034ab
branches: pgoyette-localcount
changeset: 852810:6358bf9034ab
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Mon Jul 18 03:49:59 2016 +0000
description:
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.
diffstat:
sys/dev/audio.c | 12 ++++++++++--
sys/dev/cgd.c | 15 +++++++++++++--
sys/dev/dm/device-mapper.c | 14 +++++++++++++-
sys/dev/fss.c | 15 +++++++++++++--
sys/dev/ld.c | 15 +++++++++++++--
sys/dev/md.c | 15 +++++++++++++--
sys/dev/pci/pci_usrreq.c | 12 ++++++++++--
sys/dev/rndpseudo.c | 12 ++++++++++--
sys/dev/scsipi/cd.c | 15 +++++++++++++--
sys/dev/scsipi/sd.c | 15 +++++++++++++--
sys/dev/sysmon/sysmon.c | 12 ++++++++++--
sys/dev/usb/ucom.c | 12 ++++++++++--
sys/dev/usb/ulpt.c | 12 ++++++++++--
sys/dev/vnd.c | 15 +++++++++++++--
sys/dev/wscons/wskbd.c | 12 ++++++++++--
sys/dev/wscons/wsmouse.c | 12 ++++++++++--
sys/kern/kern_drvctl.c | 12 ++++++++++--
sys/kern/tty_ptm.c | 17 ++++++++++++++---
sys/kern/tty_pty.c | 15 +++++++++++++--
sys/kern/tty_tty.c | 12 ++++++++++--
sys/net/if_tap.c | 12 ++++++++++--
sys/net/npf/npf.c | 12 ++++++++++--
sys/opencrypto/cryptodev.c | 12 ++++++++++--
sys/rump/librump/rumpvfs/devnull.c | 12 ++++++++++--
sys/rump/librump/rumpvfs/rumpblk.c | 18 ++++++++++++++++--
25 files changed, 287 insertions(+), 50 deletions(-)
diffs (truncated from 1287 to 300 lines):
diff -r 828e9ab9e536 -r 6358bf9034ab sys/dev/audio.c
--- a/sys/dev/audio.c Mon Jul 18 03:39:13 2016 +0000
+++ b/sys/dev/audio.c Mon Jul 18 03:49:59 2016 +0000
@@ -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 @@
#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_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 @@
.d_mmap = audiommap,
.d_kqfilter = audiokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &audio_localcount,
+#endif
.d_flag = D_OTHER | D_MPSAFE
};
diff -r 828e9ab9e536 -r 6358bf9034ab sys/dev/cgd.c
--- a/sys/dev/cgd.c Mon Jul 18 03:39:13 2016 +0000
+++ b/sys/dev/cgd.c Mon Jul 18 03:49:59 2016 +0000
@@ -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 @@
#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_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 @@
.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 @@
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &cgd_c_localcount,
+#endif
.d_flag = D_DISK
};
diff -r 828e9ab9e536 -r 6358bf9034ab sys/dev/dm/device-mapper.c
--- a/sys/dev/dm/device-mapper.c Mon Jul 18 03:39:13 2016 +0000
+++ b/sys/dev/dm/device-mapper.c Mon Jul 18 03:49:59 2016 +0000
@@ -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 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 @@
.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 @@
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &dm_c_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
diff -r 828e9ab9e536 -r 6358bf9034ab sys/dev/fss.c
--- a/sys/dev/fss.c Mon Jul 18 03:39:13 2016 +0000
+++ b/sys/dev/fss.c Mon Jul 18 03:49:59 2016 +0000
@@ -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 @@
#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 @@
.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 @@
.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 @@
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
+#ifdef _MODULE
+ .d_localcount = &fss_c_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
diff -r 828e9ab9e536 -r 6358bf9034ab sys/dev/ld.c
--- a/sys/dev/ld.c Mon Jul 18 03:39:13 2016 +0000
+++ b/sys/dev/ld.c Mon Jul 18 03:49:59 2016 +0000
@@ -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 @@
#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_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 @@
.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 @@
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = lddiscard,
+#ifdef _MODULE
+ .d_localcount = &ld_c_localcount;
+#endif
.d_flag = D_DISK | D_MPSAFE
};
diff -r 828e9ab9e536 -r 6358bf9034ab sys/dev/md.c
--- a/sys/dev/md.c Mon Jul 18 03:39:13 2016 +0000
+++ b/sys/dev/md.c Mon Jul 18 03:49:59 2016 +0000
@@ -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 @@
#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_strategy(mdstrategy);
static dev_type_size(mdsize);
+#ifdef _MODULE
+struct localcount md_b_localcount, md_c_localcount;
+#endif
Home |
Main Index |
Thread Index |
Old Index