Module Name: src
Committed By: pgoyette
Date: Sat Aug 21 13:18:36 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c
src/sys/dev/mii: mii_physubr.c
src/sys/dev/pci: pci_subr.c
src/sys/dev/scsipi: scsipiconf.c
src/sys/dev/usb: usb_subr.c
Log Message:
Update the various xxx_verbose modules to conform to the module subsystem's
new locking protocol.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/scsipi/scsipiconf.c
cvs rdiff -u -r1.175 -r1.176 src/sys/dev/usb/usb_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.215 src/sys/dev/acpi/acpi.c:1.216
--- src/sys/dev/acpi/acpi.c:1.215 Mon Aug 9 09:36:42 2010
+++ src/sys/dev/acpi/acpi.c Sat Aug 21 13:18:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.215 2010/08/09 09:36:42 gsutre Exp $ */
+/* $NetBSD: acpi.c,v 1.216 2010/08/21 13:18:35 pgoyette Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.215 2010/08/09 09:36:42 gsutre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.216 2010/08/21 13:18:35 pgoyette Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -1793,11 +1793,8 @@
acpi_load_verbose(void)
{
- if (acpi_verbose_loaded == 0) {
- mutex_enter(&module_lock);
+ if (acpi_verbose_loaded == 0)
module_autoload("acpiverbose", MODULE_CLASS_MISC);
- mutex_exit(&module_lock);
- }
}
void
Index: src/sys/dev/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.71 src/sys/dev/mii/mii_physubr.c:1.72
--- src/sys/dev/mii/mii_physubr.c:1.71 Sun Jul 25 14:44:34 2010
+++ src/sys/dev/mii/mii_physubr.c Sat Aug 21 13:18:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.71 2010/07/25 14:44:34 pgoyette Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.72 2010/08/21 13:18:35 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.71 2010/07/25 14:44:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.72 2010/08/21 13:18:35 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -71,11 +71,8 @@
*/
void mii_load_verbose(void)
{
- if (mii_verbose_loaded == 0) {
- mutex_enter(&module_lock);
+ if (mii_verbose_loaded == 0)
module_autoload("miiverbose", MODULE_CLASS_MISC);
- mutex_exit(&module_lock);
- }
}
static void mii_phy_statusmsg(struct mii_softc *);
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.84 src/sys/dev/pci/pci_subr.c:1.85
--- src/sys/dev/pci/pci_subr.c:1.84 Sun Jul 25 14:14:25 2010
+++ src/sys/dev/pci/pci_subr.c Sat Aug 21 13:18:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.84 2010/07/25 14:14:25 pgoyette Exp $ */
+/* $NetBSD: pci_subr.c,v 1.85 2010/08/21 13:18:35 pgoyette Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.84 2010/07/25 14:14:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.85 2010/08/21 13:18:35 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -323,11 +323,8 @@
*/
void pci_load_verbose(void)
{
- if (pciverbose_loaded == 0) {
- mutex_enter(&module_lock);
+ if (pciverbose_loaded == 0)
module_autoload("pciverbose", MODULE_CLASS_MISC);
- mutex_exit(&module_lock);
- }
}
const char *pci_findvendor_stub(pcireg_t id_reg)
Index: src/sys/dev/scsipi/scsipiconf.c
diff -u src/sys/dev/scsipi/scsipiconf.c:1.39 src/sys/dev/scsipi/scsipiconf.c:1.40
--- src/sys/dev/scsipi/scsipiconf.c:1.39 Sun Jul 25 13:49:58 2010
+++ src/sys/dev/scsipi/scsipiconf.c Sat Aug 21 13:18:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.c,v 1.39 2010/07/25 13:49:58 pgoyette Exp $ */
+/* $NetBSD: scsipiconf.c,v 1.40 2010/08/21 13:18:36 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.39 2010/07/25 13:49:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.40 2010/08/21 13:18:36 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,11 +107,8 @@
void
scsipi_load_verbose(void)
{
- if (scsi_verbose_loaded == 0) {
- mutex_enter(&module_lock);
+ if (scsi_verbose_loaded == 0)
module_autoload("scsiverbose", MODULE_CLASS_MISC);
- mutex_exit(&module_lock);
- }
}
/*
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.175 src/sys/dev/usb/usb_subr.c:1.176
--- src/sys/dev/usb/usb_subr.c:1.175 Sat Aug 7 21:09:48 2010
+++ src/sys/dev/usb/usb_subr.c Sat Aug 21 13:18:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.175 2010/08/07 21:09:48 christos Exp $ */
+/* $NetBSD: usb_subr.c,v 1.176 2010/08/21 13:18:36 pgoyette Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.175 2010/08/07 21:09:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.176 2010/08/21 13:18:36 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usbverbose.h"
@@ -122,11 +122,8 @@
*/
void usb_load_verbose(void)
{
- if (usb_verbose_loaded == 0) {
- mutex_enter(&module_lock);
+ if (usb_verbose_loaded == 0)
module_autoload("usbverbose", MODULE_CLASS_MISC);
- mutex_exit(&module_lock);
- }
}
void get_usb_vendor_stub(char *v, size_t l, usb_vendor_id_t v_id)
