summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2008-01-04 21:17:40 +0000
committerad <ad@NetBSD.org>2008-01-04 21:17:40 +0000
commit0664a0459bf6ef4342e31b3bf0327a7bc3997776 (patch)
treeb48e347640c1fc0918c24ded9444d55a24a31878 /sys/dev
parent46a018d0e2a929dda153017a300c25e2e4c045c5 (diff)
Start detangling lock.h from intr.h. This is likely to cause short term
breakage, but the mess of dependencies has been regularly breaking the build recently anyhow.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/pckbc_acpi.c6
-rw-r--r--sys/dev/apm/apm.c5
-rw-r--r--sys/dev/ata/ata.c6
-rw-r--r--sys/dev/cgd.c5
-rw-r--r--sys/dev/cgdvar.h4
-rw-r--r--sys/dev/dmover/dmover_io.c6
-rw-r--r--sys/dev/dmover/dmover_request.c6
-rw-r--r--sys/dev/dmover/dmover_session.c6
-rw-r--r--sys/dev/dmover/swdmover.c5
-rw-r--r--sys/dev/fss.c5
-rw-r--r--sys/dev/hpc/hpcfb.c5
-rw-r--r--sys/dev/ic/ath.c5
-rw-r--r--sys/dev/ic/ath_netbsd.c5
-rw-r--r--sys/dev/ic/athrate-amrr.c7
-rw-r--r--sys/dev/ic/athrate-onoe.c7
-rw-r--r--sys/dev/ic/athrate-sample.c5
-rw-r--r--sys/dev/ic/icpsp.c5
-rw-r--r--sys/dev/ic/ncr53c9xvar.h4
-rw-r--r--sys/dev/ic/pckbc.c5
-rw-r--r--sys/dev/ic/sl811hs.c6
-rw-r--r--sys/dev/ic/sl811hsvar.h4
-rw-r--r--sys/dev/ieee1394/fwdma.c5
-rw-r--r--sys/dev/isa/pckbc_isa.c5
-rw-r--r--sys/dev/ld.c5
-rw-r--r--sys/dev/lockstat.c7
-rw-r--r--sys/dev/lockstat.h4
-rw-r--r--sys/dev/mca/edvar.h4
-rw-r--r--sys/dev/midivar.h4
-rw-r--r--sys/dev/mvme/vme_two_isr.c6
-rw-r--r--sys/dev/ofisa/pckbc_ofisa.c6
-rw-r--r--sys/dev/pci/agp_ali.c5
-rw-r--r--sys/dev/pci/agp_amd.c5
-rw-r--r--sys/dev/pci/agp_amd64.c3
-rw-r--r--sys/dev/pci/agp_apple.c5
-rw-r--r--sys/dev/pci/agp_i810.c5
-rw-r--r--sys/dev/pci/agp_intel.c5
-rw-r--r--sys/dev/pci/agp_sis.c5
-rw-r--r--sys/dev/pci/agp_via.c5
-rw-r--r--sys/dev/pci/bktr/bktr_core.c5
-rw-r--r--sys/dev/pci/cxgb_l2t.c3
-rw-r--r--sys/dev/pci/cy82c693.c7
-rw-r--r--sys/dev/pci/if_lmc.c6
-rw-r--r--sys/dev/pci/if_xge.c5
-rw-r--r--sys/dev/pckbport/pckbport.c5
-rw-r--r--sys/dev/ppbus/ppbus_base.c5
-rw-r--r--sys/dev/raidframe/raidframevar.h4
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c5
-rw-r--r--sys/dev/scsipi/scsiconf.c6
-rw-r--r--sys/dev/sysmon/sysmon.c5
-rw-r--r--sys/dev/sysmon/sysmon_taskq.c5
-rw-r--r--sys/dev/usb/stuirda.c5
-rw-r--r--sys/dev/usb/umidi.c5
-rw-r--r--sys/dev/usb/umidi_quirks.c5
53 files changed, 116 insertions, 156 deletions
diff --git a/sys/dev/acpi/pckbc_acpi.c b/sys/dev/acpi/pckbc_acpi.c
index e39b6d692ea..74a30d8871a 100644
--- a/sys/dev/acpi/pckbc_acpi.c
+++ b/sys/dev/acpi/pckbc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.23 2007/12/09 20:27:53 jmcneill Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.24 2008/01/04 21:17:49 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.23 2007/12/09 20:27:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.24 2008/01/04 21:17:49 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.23 2007/12/09 20:27:53 jmcneill Exp
#include <sys/malloc.h>
#include <sys/errno.h>
#include <sys/queue.h>
-#include <sys/lock.h>
-
#include <sys/bus.h>
#include <dev/isa/isareg.h>
diff --git a/sys/dev/apm/apm.c b/sys/dev/apm/apm.c
index a0dd710e288..bc896c09c5a 100644
--- a/sys/dev/apm/apm.c
+++ b/sys/dev/apm/apm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apm.c,v 1.16 2007/12/09 20:27:54 jmcneill Exp $ */
+/* $NetBSD: apm.c,v 1.17 2008/01/04 21:17:50 ad Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.16 2007/12/09 20:27:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.17 2008/01/04 21:17:50 ad Exp $");
#include "opt_apm.h"
@@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.16 2007/12/09 20:27:54 jmcneill Exp $");
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/kthread.h>
-#include <sys/lock.h>
#include <sys/user.h>
#include <sys/malloc.h>
#include <sys/device.h>
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index 5dbf66b4a71..51da83aef10 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.93 2007/12/20 20:12:01 pooka Exp $ */
+/* $NetBSD: ata.c,v 1.94 2008/01/04 21:17:50 ad Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.93 2007/12/20 20:12:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.94 2008/01/04 21:17:50 ad Exp $");
#include "opt_ata.h"
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.93 2007/12/20 20:12:01 pooka Exp $");
#include <sys/errno.h>
#include <sys/ataio.h>
#include <sys/kmem.h>
-
+#include <sys/simplelock.h>
#include <sys/intr.h>
#include <sys/bus.h>
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index bff5c17e45f..2b58692eba6 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.49 2008/01/02 11:48:36 ad Exp $ */
+/* $NetBSD: cgd.c,v 1.50 2008/01/04 21:17:46 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.49 2008/01/02 11:48:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.50 2008/01/04 21:17:46 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.49 2008/01/02 11:48:36 ad Exp $");
#include <sys/disklabel.h>
#include <sys/fcntl.h>
#include <sys/vnode.h>
-#include <sys/lock.h>
#include <sys/conf.h>
#include <dev/dkvar.h>
diff --git a/sys/dev/cgdvar.h b/sys/dev/cgdvar.h
index 15fd51cdb50..fe8525845c7 100644
--- a/sys/dev/cgdvar.h
+++ b/sys/dev/cgdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdvar.h,v 1.9 2007/03/04 06:01:41 christos Exp $ */
+/* $NetBSD: cgdvar.h,v 1.10 2008/01/04 21:17:47 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -39,6 +39,8 @@
#ifndef _DEV_CGDVAR_H_
#define _DEV_CGDVAR_H_
+#include <sys/simplelock.h>
+
/* ioctl(2) code */
struct cgd_ioctl {
const char *ci_disk;
diff --git a/sys/dev/dmover/dmover_io.c b/sys/dev/dmover/dmover_io.c
index e3223613990..b04bfd5f2e0 100644
--- a/sys/dev/dmover/dmover_io.c
+++ b/sys/dev/dmover/dmover_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_io.c,v 1.28 2007/09/25 14:13:34 ad Exp $ */
+/* $NetBSD: dmover_io.c,v 1.29 2008/01/04 21:17:52 ad 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.28 2007/09/25 14:13:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.29 2008/01/04 21:17:52 ad Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.28 2007/09/25 14:13:34 ad Exp $");
#include <sys/proc.h>
#include <sys/poll.h>
#include <sys/malloc.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/filio.h>
diff --git a/sys/dev/dmover/dmover_request.c b/sys/dev/dmover/dmover_request.c
index e245a4db99a..0c2bc1be927 100644
--- a/sys/dev/dmover/dmover_request.c
+++ b/sys/dev/dmover/dmover_request.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_request.c,v 1.6 2007/11/12 15:50:21 he Exp $ */
+/* $NetBSD: dmover_request.c,v 1.7 2008/01/04 21:17:52 ad Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,10 +40,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_request.c,v 1.6 2007/11/12 15:50:21 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_request.c,v 1.7 2008/01/04 21:17:52 ad Exp $");
#include <sys/param.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
#include <sys/pool.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/dmover/dmover_session.c b/sys/dev/dmover/dmover_session.c
index 6cd82596f99..505396af496 100644
--- a/sys/dev/dmover/dmover_session.c
+++ b/sys/dev/dmover/dmover_session.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_session.c,v 1.4 2007/03/12 19:56:19 ad Exp $ */
+/* $NetBSD: dmover_session.c,v 1.5 2008/01/04 21:17:52 ad Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,10 +40,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_session.c,v 1.4 2007/03/12 19:56:19 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_session.c,v 1.5 2008/01/04 21:17:52 ad Exp $");
#include <sys/param.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
#include <sys/pool.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/dmover/swdmover.c b/sys/dev/dmover/swdmover.c
index a5a3de13b92..c5e422cb161 100644
--- a/sys/dev/dmover/swdmover.c
+++ b/sys/dev/dmover/swdmover.c
@@ -1,4 +1,4 @@
-/* $NetBSD: swdmover.c,v 1.11 2007/07/12 14:15:55 he Exp $ */
+/* $NetBSD: swdmover.c,v 1.12 2008/01/04 21:17:53 ad Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -49,10 +49,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.11 2007/07/12 14:15:55 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.12 2008/01/04 21:17:53 ad Exp $");
#include <sys/param.h>
-#include <sys/lock.h>
#include <sys/kthread.h>
#include <sys/systm.h>
#include <sys/uio.h>
diff --git a/sys/dev/fss.c b/sys/dev/fss.c
index b432ad8aa6c..ff44d1d836b 100644
--- a/sys/dev/fss.c
+++ b/sys/dev/fss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.42 2008/01/02 11:48:36 ad Exp $ */
+/* $NetBSD: fss.c,v 1.43 2008/01/04 21:17:47 ad Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.42 2008/01/02 11:48:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.43 2008/01/04 21:17:47 ad Exp $");
#include "fss.h"
@@ -66,6 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.42 2008/01/02 11:48:36 ad Exp $");
#include <sys/conf.h>
#include <sys/kthread.h>
#include <sys/fstrans.h>
+#include <sys/simplelock.h>
#include <miscfs/specfs/specdev.h>
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c
index 8dd170818ea..cf03a1d448d 100644
--- a/sys/dev/hpc/hpcfb.c
+++ b/sys/dev/hpc/hpcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.44 2007/10/29 20:45:57 peter Exp $ */
+/* $NetBSD: hpcfb.c,v 1.45 2008/01/04 21:17:53 ad Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.44 2007/10/29 20:45:57 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.45 2008/01/04 21:17:53 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -55,7 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.44 2007/10/29 20:45:57 peter Exp $");
#include <sys/signalvar.h>
#include <sys/proc.h>
#include <sys/kthread.h>
-#include <sys/lock.h>
#include <sys/user.h>
#include <sys/device.h>
#include <sys/conf.h>
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 742528d83ca..bc91b6a5e0e 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.97 2007/12/22 00:41:01 dyoung Exp $ */
+/* $NetBSD: ath.c,v 1.98 2008/01/04 21:17:54 ad Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.97 2007/12/22 00:41:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.98 2008/01/04 21:17:54 ad Exp $");
#endif
/*
@@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.97 2007/12/22 00:41:01 dyoung Exp $");
#include <sys/sysctl.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
-#include <sys/lock.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/sockio.h>
diff --git a/sys/dev/ic/ath_netbsd.c b/sys/dev/ic/ath_netbsd.c
index 177bedce5a4..d6b31236d49 100644
--- a/sys/dev/ic/ath_netbsd.c
+++ b/sys/dev/ic/ath_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ath_netbsd.c,v 1.12 2007/11/26 23:48:37 dyoung Exp $ */
+/* $NetBSD: ath_netbsd.c,v 1.13 2008/01/04 21:17:56 ad Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.12 2007/11/26 23:48:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.13 2008/01/04 21:17:56 ad Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.12 2007/11/26 23:48:37 dyoung Exp $
#include <sys/sysctl.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
-#include <sys/lock.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/sockio.h>
diff --git a/sys/dev/ic/athrate-amrr.c b/sys/dev/ic/athrate-amrr.c
index c20210981fe..97ca7a55d7f 100644
--- a/sys/dev/ic/athrate-amrr.c
+++ b/sys/dev/ic/athrate-amrr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-amrr.c,v 1.9 2007/10/19 11:59:47 ad Exp $ */
+/* $NetBSD: athrate-amrr.c,v 1.10 2008/01/04 21:17:56 ad Exp $ */
/*-
* Copyright (c) 2004 INRIA
@@ -43,7 +43,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.10 2005/08/09 10:19:43 rwatson Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: athrate-amrr.c,v 1.9 2007/10/19 11:59:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athrate-amrr.c,v 1.10 2008/01/04 21:17:56 ad Exp $");
#endif
/*
@@ -58,11 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: athrate-amrr.c,v 1.9 2007/10/19 11:59:47 ad Exp $");
#include <sys/systm.h>
#include <sys/sysctl.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/errno.h>
-
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
diff --git a/sys/dev/ic/athrate-onoe.c b/sys/dev/ic/athrate-onoe.c
index 3bde065d461..aa74d005fef 100644
--- a/sys/dev/ic/athrate-onoe.c
+++ b/sys/dev/ic/athrate-onoe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-onoe.c,v 1.11 2007/11/26 20:45:01 dyoung Exp $ */
+/* $NetBSD: athrate-onoe.c,v 1.12 2008/01/04 21:17:57 ad Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.10 2005/08/09 10:19:43 rwatson Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: athrate-onoe.c,v 1.11 2007/11/26 20:45:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athrate-onoe.c,v 1.12 2008/01/04 21:17:57 ad Exp $");
#endif
/*
@@ -53,12 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: athrate-onoe.c,v 1.11 2007/11/26 20:45:01 dyoung Exp
#include <sys/systm.h>
#include <sys/sysctl.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/errno.h>
#include <sys/device.h>
-
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
diff --git a/sys/dev/ic/athrate-sample.c b/sys/dev/ic/athrate-sample.c
index 4a0a75b95df..e3043d0ee1d 100644
--- a/sys/dev/ic/athrate-sample.c
+++ b/sys/dev/ic/athrate-sample.c
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-sample.c,v 1.13 2007/10/19 11:59:47 ad Exp $ */
+/* $NetBSD: athrate-sample.c,v 1.14 2008/01/04 21:17:57 ad Exp $ */
/*-
* Copyright (c) 2005 John Bicket
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.9 2005/07/22 16:50:17 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.13 2007/10/19 11:59:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.14 2008/01/04 21:17:57 ad Exp $");
#endif
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.13 2007/10/19 11:59:47 ad Exp $
#include <sys/systm.h>
#include <sys/sysctl.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/errno.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/icpsp.c b/sys/dev/ic/icpsp.c
index a22123e1008..2926487f831 100644
--- a/sys/dev/ic/icpsp.c
+++ b/sys/dev/ic/icpsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icpsp.c,v 1.18 2007/10/19 11:59:53 ad Exp $ */
+/* $NetBSD: icpsp.c,v 1.19 2008/01/04 21:17:57 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.18 2007/10/19 11:59:53 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.19 2008/01/04 21:17:57 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.18 2007/10/19 11:59:53 ad Exp $");
#include <sys/endian.h>
#include <sys/malloc.h>
#include <sys/scsiio.h>
-#include <sys/lock.h>
#include <sys/bswap.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h
index 72f8ada21d2..8347b6ac4a2 100644
--- a/sys/dev/ic/ncr53c9xvar.h
+++ b/sys/dev/ic/ncr53c9xvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9xvar.h,v 1.48 2007/03/04 06:01:59 christos Exp $ */
+/* $NetBSD: ncr53c9xvar.h,v 1.49 2008/01/04 21:17:57 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
#ifndef _DEV_IC_NCR53C9XVAR_H_
#define _DEV_IC_NCR53C9XVAR_H_
-#include <sys/lock.h>
+#include <sys/simplelock.h>
/* Set this to 1 for normal debug, or 2 for per-target tracing. */
/* #define NCR53C9X_DEBUG 1 */
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index ed39bd94af1..0cf3f1e470e 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.39 2007/12/09 20:27:58 jmcneill Exp $ */
+/* $NetBSD: pckbc.c,v 1.40 2008/01/04 21:17:57 ad Exp $ */
/*
* Copyright (c) 2004 Ben Harris.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.39 2007/12/09 20:27:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.40 2008/01/04 21:17:57 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.39 2007/12/09 20:27:58 jmcneill Exp $");
#include <sys/malloc.h>
#include <sys/errno.h>
#include <sys/queue.h>
-#include <sys/lock.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c
index 25576070e56..9d823390158 100644
--- a/sys/dev/ic/sl811hs.c
+++ b/sys/dev/ic/sl811hs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.16 2007/11/06 21:51:07 ad Exp $ */
+/* $NetBSD: sl811hs.c,v 1.17 2008/01/04 21:17:58 ad Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.16 2007/11/06 21:51:07 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.17 2008/01/04 21:17:58 ad Exp $");
#include <sys/cdefs.h>
#include <sys/param.h>
@@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.16 2007/11/06 21:51:07 ad Exp $");
#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/gcq.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
#include <sys/intr.h>
#include <sys/cpu.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/sl811hsvar.h b/sys/dev/ic/sl811hsvar.h
index 8ff959cc2d8..c5c0dd5401e 100644
--- a/sys/dev/ic/sl811hsvar.h
+++ b/sys/dev/ic/sl811hsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hsvar.h,v 1.2 2007/08/15 03:53:10 kiyohara Exp $ */
+/* $NetBSD: sl811hsvar.h,v 1.3 2008/01/04 21:17:58 ad Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -14,7 +14,7 @@
*/
#include <sys/gcq.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
#include "opt_slhci.h"
#define SC_DEV(sc) (&((sc)->sc_bus.bdev))
diff --git a/sys/dev/ieee1394/fwdma.c b/sys/dev/ieee1394/fwdma.c
index d91af436aa7..dac1598db2e 100644
--- a/sys/dev/ieee1394/fwdma.c
+++ b/sys/dev/ieee1394/fwdma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdma.c,v 1.11 2007/12/11 11:34:08 lukem Exp $ */
+/* $NetBSD: fwdma.c,v 1.12 2008/01/04 21:17:59 ad Exp $ */
/*-
* Copyright (c) 2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwdma.c,v 1.11 2007/12/11 11:34:08 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwdma.c,v 1.12 2008/01/04 21:17:59 ad Exp $");
#if defined(__FreeBSD__)
__FBSDID("$FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.9 2007/06/06 14:31:36 simokawa Exp $");
#endif
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.9 2007/06/06 14:31:36 simok
#include <sys/conf.h>
#include <sys/malloc.h>
#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
-#include <sys/lock.h>
#include <sys/mutex.h>
#endif
diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c
index 1af58a74c50..13f359684b9 100644
--- a/sys/dev/isa/pckbc_isa.c
+++ b/sys/dev/isa/pckbc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_isa.c,v 1.22 2007/10/19 12:00:22 ad Exp $ */
+/* $NetBSD: pckbc_isa.c,v 1.23 2008/01/04 21:17:59 ad Exp $ */
/*
* Copyright (c) 1998
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.22 2007/10/19 12:00:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.23 2008/01/04 21:17:59 ad Exp $");
#include "opt_pckbc.h"
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.22 2007/10/19 12:00:22 ad Exp $");
#include <sys/malloc.h>
#include <sys/errno.h>
#include <sys/queue.h>
-#include <sys/lock.h>
#include <sys/bus.h>
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index 9c3047c6d31..c9b0e16f808 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.53 2007/12/05 07:06:50 ad Exp $ */
+/* $NetBSD: ld.c,v 1.54 2008/01/04 21:17:48 ad Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.53 2007/12/05 07:06:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.54 2008/01/04 21:17:48 ad Exp $");
#include "rnd.h"
@@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.53 2007/12/05 07:06:50 ad Exp $");
#include <sys/disk.h>
#include <sys/dkio.h>
#include <sys/stat.h>
-#include <sys/lock.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/vnode.h>
diff --git a/sys/dev/lockstat.c b/sys/dev/lockstat.c
index d00195f0def..dd7a385215a 100644
--- a/sys/dev/lockstat.c
+++ b/sys/dev/lockstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.12 2007/12/20 21:09:00 ad Exp $ */
+/* $NetBSD: lockstat.c,v 1.13 2008/01/04 21:17:48 ad Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -47,11 +47,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.12 2007/12/20 21:09:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.13 2008/01/04 21:17:48 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
-#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
#include <sys/systm.h>
@@ -63,6 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.12 2007/12/20 21:09:00 ad Exp $");
#include <dev/lockstat.h>
+#include <machine/lock.h>
+
#ifndef __HAVE_CPU_COUNTER
#error CPU counters not available
#endif
diff --git a/sys/dev/lockstat.h b/sys/dev/lockstat.h
index f128d33dff6..3ab1ad06933 100644
--- a/sys/dev/lockstat.h
+++ b/sys/dev/lockstat.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.h,v 1.5 2007/07/14 13:30:44 ad Exp $ */
+/* $NetBSD: lockstat.h,v 1.6 2008/01/04 21:17:49 ad Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@ typedef struct lsbuf {
} lsbuf_t;
/*
- * Tracing stubs used by lock providers, e.g. lockmgr().
+ * Tracing stubs used by lock providers.
*/
#if defined(_KERNEL) && defined(__HAVE_CPU_COUNTER) && NLOCKSTAT > 0
diff --git a/sys/dev/mca/edvar.h b/sys/dev/mca/edvar.h
index 5cb356aacc3..88287a32d2e 100644
--- a/sys/dev/mca/edvar.h
+++ b/sys/dev/mca/edvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: edvar.h,v 1.11 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: edvar.h,v 1.12 2008/01/04 21:17:59 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,6 +33,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/simplelock.h>
+
struct edc_mca_softc;
struct ed_softc {
diff --git a/sys/dev/midivar.h b/sys/dev/midivar.h
index 3e456d023d9..069fefd4ddd 100644
--- a/sys/dev/midivar.h
+++ b/sys/dev/midivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: midivar.h,v 1.13 2007/02/09 21:55:26 ad Exp $ */
+/* $NetBSD: midivar.h,v 1.14 2008/01/04 21:17:49 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#include <sys/callout.h>
#include <sys/cdefs.h>
#include <sys/device.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
/*
* In both xmt and rcv direction, the midi_fst runs at the time data are
diff --git a/sys/dev/mvme/vme_two_isr.c b/sys/dev/mvme/vme_two_isr.c
index ce60dfda555..85c9166ee29 100644
--- a/sys/dev/mvme/vme_two_isr.c
+++ b/sys/dev/mvme/vme_two_isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_two_isr.c,v 1.8 2007/12/03 15:34:32 ad Exp $ */
+/* $NetBSD: vme_two_isr.c,v 1.9 2008/01/04 21:17:59 ad Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.8 2007/12/03 15:34:32 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.9 2008/01/04 21:17:59 ad Exp $");
#include "vmetwo.h"
@@ -52,8 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.8 2007/12/03 15:34:32 ad Exp $");
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/lock.h>
-
#include <sys/cpu.h>
#include <sys/bus.h>
diff --git a/sys/dev/ofisa/pckbc_ofisa.c b/sys/dev/ofisa/pckbc_ofisa.c
index 59096753a74..441d5e35a77 100644
--- a/sys/dev/ofisa/pckbc_ofisa.c
+++ b/sys/dev/ofisa/pckbc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_ofisa.c,v 1.13 2007/10/19 12:00:38 ad Exp $ */
+/* $NetBSD: pckbc_ofisa.c,v 1.14 2008/01/04 21:17:59 ad Exp $ */
/*
* Copyright (c) 1998
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.13 2007/10/19 12:00:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.14 2008/01/04 21:17:59 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,8 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.13 2007/10/19 12:00:38 ad Exp $");
#include <sys/malloc.h>
#include <sys/errno.h>
#include <sys/queue.h>
-#include <sys/lock.h>
-
#include <sys/bus.h>
#include <dev/isa/isareg.h>
diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c
index a843c826c86..8b5515c603f 100644
--- a/sys/dev/pci/agp_ali.c
+++ b/sys/dev/pci/agp_ali.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_ali.c,v 1.12 2007/10/19 12:00:39 ad Exp $ */
+/* $NetBSD: agp_ali.c,v 1.13 2008/01/04 21:18:00 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.12 2007/10/19 12:00:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.13 2008/01/04 21:18:00 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.12 2007/10/19 12:00:39 ad Exp $");
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
-#include <sys/lock.h>
#include <sys/agpio.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c
index 4966c7c8526..797835a1a1a 100644
--- a/sys/dev/pci/agp_amd.c
+++ b/sys/dev/pci/agp_amd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_amd.c,v 1.18 2007/03/04 06:02:15 christos Exp $ */
+/* $NetBSD: agp_amd.c,v 1.19 2008/01/04 21:18:00 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,13 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.18 2007/03/04 06:02:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.19 2008/01/04 21:18:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/agp_amd64.c b/sys/dev/pci/agp_amd64.c
index df5f47fe0ff..d707ec9e27e 100644
--- a/sys/dev/pci/agp_amd64.c
+++ b/sys/dev/pci/agp_amd64.c
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.2 2007/10/19 12:00:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.3 2008/01/04 21:18:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -34,7 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.2 2007/10/19 12:00:39 ad Exp $");
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
-#include <sys/lock.h>
#include <sys/agpio.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/pci/agp_apple.c b/sys/dev/pci/agp_apple.c
index 1c8cfc77778..10f97e44fde 100644
--- a/sys/dev/pci/agp_apple.c
+++ b/sys/dev/pci/agp_apple.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_apple.c,v 1.2 2007/10/19 12:00:39 ad Exp $ */
+/* $NetBSD: agp_apple.c,v 1.3 2008/01/04 21:18:00 ad Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_apple.c,v 1.2 2007/10/19 12:00:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_apple.c,v 1.3 2008/01/04 21:18:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index 0b141f8d186..9d0f5e5fa43 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.47 2007/12/09 20:28:05 jmcneill Exp $ */
+/* $NetBSD: agp_i810.c,v 1.48 2008/01/04 21:18:00 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.47 2007/12/09 20:28:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.48 2008/01/04 21:18:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/conf.h>
diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c
index 9cafc91a7c4..31441069de6 100644
--- a/sys/dev/pci/agp_intel.c
+++ b/sys/dev/pci/agp_intel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_intel.c,v 1.26 2007/12/15 00:39:28 perry Exp $ */
+/* $NetBSD: agp_intel.c,v 1.27 2008/01/04 21:18:00 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,13 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.26 2007/12/15 00:39:28 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.27 2008/01/04 21:18:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/agpio.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c
index 0c77251f6f9..3522ece7514 100644
--- a/sys/dev/pci/agp_sis.c
+++ b/sys/dev/pci/agp_sis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_sis.c,v 1.11 2007/10/19 12:00:39 ad Exp $ */
+/* $NetBSD: agp_sis.c,v 1.12 2008/01/04 21:18:01 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,13 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.11 2007/10/19 12:00:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.12 2008/01/04 21:18:01 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c
index 0beae86449b..b8b9461d9e3 100644
--- a/sys/dev/pci/agp_via.c
+++ b/sys/dev/pci/agp_via.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_via.c,v 1.14 2007/10/19 12:00:39 ad Exp $ */
+/* $NetBSD: agp_via.c,v 1.15 2008/01/04 21:18:01 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,13 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.14 2007/10/19 12:00:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.15 2008/01/04 21:18:01 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index dc6c45c8f4f..23ca3920de9 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.c,v 1.44 2007/10/19 12:01:02 ad Exp $ */
+/* $NetBSD: bktr_core.c,v 1.45 2008/01/04 21:18:03 ad Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.44 2007/10/19 12:01:02 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.45 2008/01/04 21:18:03 ad Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -111,7 +111,6 @@ __KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.44 2007/10/19 12:01:02 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
diff --git a/sys/dev/pci/cxgb_l2t.c b/sys/dev/pci/cxgb_l2t.c
index 86e08a04397..c732d0dbe20 100644
--- a/sys/dev/pci/cxgb_l2t.c
+++ b/sys/dev/pci/cxgb_l2t.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.5 2007/12/11 11:25:46 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.6 2008/01/04 21:18:01 ad Exp $");
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $");
#endif
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.c,v 1.2 2007/05/28 22:57:26 kmacy
#include <sys/module.h>
#include <sys/bus.h>
#endif
-#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
diff --git a/sys/dev/pci/cy82c693.c b/sys/dev/pci/cy82c693.c
index 5e36ed07e01..6bdd50c5a78 100644
--- a/sys/dev/pci/cy82c693.c
+++ b/sys/dev/pci/cy82c693.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy82c693.c,v 1.4 2007/10/19 12:00:42 ad Exp $ */
+/* $NetBSD: cy82c693.c,v 1.5 2008/01/04 21:18:01 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v 1.4 2007/10/19 12:00:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v 1.5 2008/01/04 21:18:01 ad Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -50,9 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v 1.4 2007/10/19 12:00:42 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <sys/lock.h>
-
#include <sys/bus.h>
+#include <sys/simplelock.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c
index 42856d51da1..0ffdbe157bb 100644
--- a/sys/dev/pci/if_lmc.c
+++ b/sys/dev/pci/if_lmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.37 2007/12/11 11:25:51 lukem Exp $ */
+/* $NetBSD: if_lmc.c,v 1.38 2008/01/04 21:18:01 ad Exp $ */
/*-
* Copyright (c) 2002-2006 David Boggs. <boggs@boggs.palo-alto.ca.us>
@@ -99,7 +99,6 @@
# include <sys/mbuf.h>
# include <sys/socket.h>
# include <sys/sockio.h>
-# include <sys/lock.h>
# include <sys/mutex.h>
# include <sys/module.h>
# include <sys/bus.h>
@@ -143,7 +142,7 @@
#if defined(__NetBSD__)
# include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.37 2007/12/11 11:25:51 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.38 2008/01/04 21:18:01 ad Exp $");
# include <sys/param.h> /* OS version */
/* -DLKM is passed on the compiler command line */
# include "opt_inet.h" /* INET6, INET */
@@ -281,7 +280,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.37 2007/12/11 11:25:51 lukem Exp $");
# include <sys/sockio.h>
# include <sys/device.h>
# include <sys/reboot.h>
-# include <sys/lock.h>
# include <net/if.h>
# include <net/if_types.h>
# include <net/if_media.h>
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 70fefeb160d..4885af9b28d 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xge.c,v 1.6 2007/10/19 12:00:50 ad Exp $ */
+/* $NetBSD: if_xge.c,v 1.7 2008/01/04 21:18:03 ad Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.6 2007/10/19 12:00:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.7 2008/01/04 21:18:03 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -80,7 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.6 2007/10/19 12:00:50 ad Exp $");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcidevs.h>
-#include <sys/lock.h>
#include <sys/proc.h>
#include <dev/pci/if_xgereg.h>
diff --git a/sys/dev/pckbport/pckbport.c b/sys/dev/pckbport/pckbport.c
index 76436c1b67b..af9c09c05ea 100644
--- a/sys/dev/pckbport/pckbport.c
+++ b/sys/dev/pckbport/pckbport.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbport.c,v 1.10 2007/07/09 22:24:38 ad Exp $ */
+/* $NetBSD: pckbport.c,v 1.11 2008/01/04 21:18:04 ad Exp $ */
/*
* Copyright (c) 2004 Ben Harris
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbport.c,v 1.10 2007/07/09 22:24:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbport.c,v 1.11 2008/01/04 21:18:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: pckbport.c,v 1.10 2007/07/09 22:24:38 ad Exp $");
#include <sys/malloc.h>
#include <sys/errno.h>
#include <sys/queue.h>
-#include <sys/lock.h>
#include <dev/pckbport/pckbdreg.h>
#include <dev/pckbport/pckbportvar.h>
diff --git a/sys/dev/ppbus/ppbus_base.c b/sys/dev/ppbus/ppbus_base.c
index c9dc658838c..08ccc702521 100644
--- a/sys/dev/ppbus/ppbus_base.c
+++ b/sys/dev/ppbus/ppbus_base.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_base.c,v 1.14 2007/12/05 07:58:31 ad Exp $ */
+/* $NetBSD: ppbus_base.c,v 1.15 2008/01/04 21:18:04 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppbus_base.c,v 1.14 2007/12/05 07:58:31 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppbus_base.c,v 1.15 2008/01/04 21:18:04 ad Exp $");
#include "opt_ppbus_1284.h"
#include "opt_ppbus.h"
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: ppbus_base.c,v 1.14 2007/12/05 07:58:31 ad Exp $");
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <sys/lock.h>
#include <sys/systm.h>
#include <dev/ppbus/ppbus_1284.h>
diff --git a/sys/dev/raidframe/raidframevar.h b/sys/dev/raidframe/raidframevar.h
index 153cc6c0cf2..2bbc498b6ab 100644
--- a/sys/dev/raidframe/raidframevar.h
+++ b/sys/dev/raidframe/raidframevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.10 2006/09/05 01:55:21 oster Exp $ */
+/* $NetBSD: raidframevar.h,v 1.11 2008/01/04 21:18:05 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -109,7 +109,7 @@
#include <sys/uio.h>
#include <sys/param.h>
#include <sys/proc.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
#include <sys/mallocvar.h>
#endif
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 608c1440b21..44e077e7733 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.242 2008/01/02 11:48:38 ad Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.243 2008/01/04 21:18:05 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -146,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.242 2008/01/02 11:48:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.243 2008/01/04 21:18:05 ad Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -162,7 +162,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.242 2008/01/02 11:48:38 ad Exp
#include <sys/vnode.h>
#include <sys/disklabel.h>
#include <sys/conf.h>
-#include <sys/lock.h>
#include <sys/buf.h>
#include <sys/bufq.h>
#include <sys/user.h>
diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c
index 4b36b440f6a..0456ff4c40f 100644
--- a/sys/dev/scsipi/scsiconf.c
+++ b/sys/dev/scsipi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.244 2007/12/09 20:28:22 jmcneill Exp $ */
+/* $NetBSD: scsiconf.c,v 1.245 2008/01/04 21:18:05 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.244 2007/12/09 20:28:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.245 2008/01/04 21:18:05 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.244 2007/12/09 20:28:22 jmcneill Exp
#include <sys/fcntl.h>
#include <sys/scsiio.h>
#include <sys/queue.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/sysmon/sysmon.c b/sys/dev/sysmon/sysmon.c
index e78f9fcd7bb..8b2f237559c 100644
--- a/sys/dev/sysmon/sysmon.c
+++ b/sys/dev/sysmon/sysmon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.15 2007/03/04 06:02:45 christos Exp $ */
+/* $NetBSD: sysmon.c,v 1.16 2008/01/04 21:18:06 ad Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,13 +39,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.15 2007/03/04 06:02:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.16 2008/01/04 21:18:06 ad Exp $");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/errno.h>
#include <sys/fcntl.h>
-#include <sys/lock.h>
#include <sys/callout.h>
#include <sys/kernel.h>
#include <sys/systm.h>
diff --git a/sys/dev/sysmon/sysmon_taskq.c b/sys/dev/sysmon/sysmon_taskq.c
index a9d6d158bc4..864d1810fde 100644
--- a/sys/dev/sysmon/sysmon_taskq.c
+++ b/sys/dev/sysmon/sysmon_taskq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_taskq.c,v 1.11 2007/12/05 07:06:52 ad Exp $ */
+/* $NetBSD: sysmon_taskq.c,v 1.12 2008/01/04 21:18:06 ad Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -41,11 +41,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_taskq.c,v 1.11 2007/12/05 07:06:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_taskq.c,v 1.12 2008/01/04 21:18:06 ad Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
-#include <sys/lock.h>
#include <sys/queue.h>
#include <sys/proc.h>
#include <sys/kthread.h>
diff --git a/sys/dev/usb/stuirda.c b/sys/dev/usb/stuirda.c
index f10e0547dee..ba1b13df5b6 100644
--- a/sys/dev/usb/stuirda.c
+++ b/sys/dev/usb/stuirda.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stuirda.c,v 1.4 2007/12/11 12:36:02 lukem Exp $ */
+/* $NetBSD: stuirda.c,v 1.5 2008/01/04 21:18:06 ad Exp $ */
/*
* Copyright (c) 2001,2007 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.4 2007/12/11 12:36:02 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.5 2008/01/04 21:18:06 ad Exp $");
#include <sys/param.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.4 2007/12/11 12:36:02 lukem Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/lock.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/file.h>
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 2279a889828..b19a6b52525 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.32 2007/10/08 16:18:04 ad Exp $ */
+/* $NetBSD: umidi.c,v 1.33 2008/01/04 21:18:06 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.32 2007/10/08 16:18:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.33 2008/01/04 21:18:06 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.32 2007/10/08 16:18:04 ad Exp $");
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/poll.h>
-#include <sys/lock.h>
#include <sys/intr.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c
index 2ba3ac988f9..abc71c30770 100644
--- a/sys/dev/usb/umidi_quirks.c
+++ b/sys/dev/usb/umidi_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.13 2007/10/14 01:08:36 xtraeme Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.14 2008/01/04 21:18:07 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.13 2007/10/14 01:08:36 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.14 2008/01/04 21:18:07 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.13 2007/10/14 01:08:36 xtraeme Ex
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/poll.h>
-#include <sys/lock.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>