No need to include <sys/lock.h> when only <sys/rwlock.h> is needed,

so remove the former and include the latter instead of pulling it
in <dev/pci/agpvar.h>.  This header already requires various other
types anyway.  While here remove unneeded headers.

18 files changed, 37 insertions, 50 deletions

diff --git a/sys/arch/amd64/pci/agp_machdep.c b/sys/arch/amd64/pci/agp_machdep.c
index 6d3abfa49e6..0183fb89bf6 100644
--- a/sys/arch/amd64/pci/agp_machdep.c
+++ b/sys/arch/amd64/pci/agp_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_machdep.c,v 1.9 2013/12/09 19:52:11 kettenis Exp $	*/
+/*	$OpenBSD: agp_machdep.c,v 1.10 2014/03/26 14:41:41 mpi Exp $	*/
 
 /*
  * Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org>
@@ -43,8 +43,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index e1967a4e681..4549c6b085f 100644
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.40 2013/12/06 21:03:05 deraadt Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.41 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $	*/
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -58,6 +58,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
+#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/i386/pci/agp_machdep.c b/sys/arch/i386/pci/agp_machdep.c
index 259d652627c..4ad2510e4a7 100644
--- a/sys/arch/i386/pci/agp_machdep.c
+++ b/sys/arch/i386/pci/agp_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_machdep.c,v 1.15 2013/12/09 19:52:11 kettenis Exp $	*/
+/*	$OpenBSD: agp_machdep.c,v 1.16 2014/03/26 14:41:41 mpi Exp $	*/
 
 /*
  * Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org>
@@ -43,8 +43,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 525a6e3ca58..6d2b1e54d8a 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.88 2013/12/06 21:03:05 deraadt Exp $ */
+/*	$OpenBSD: pchb.c,v 1.89 2014/03/26 14:41:41 mpi Exp $ */
 /*	$NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $	*/
 
 /*
@@ -59,6 +59,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
+#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/macppc/pci/agp_machdep.c b/sys/arch/macppc/pci/agp_machdep.c
index 718d42da4e4..17b60e12b99 100644
--- a/sys/arch/macppc/pci/agp_machdep.c
+++ b/sys/arch/macppc/pci/agp_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_machdep.c,v 1.1 2012/12/04 10:42:05 mpi Exp $	*/
+/*	$OpenBSD: agp_machdep.c,v 1.2 2014/03/26 14:41:41 mpi Exp $	*/
 
 /*
  * Copyright (c) 2012 Martin Pieuchot <mpi@openbsd.org>
@@ -18,13 +18,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
-
 #include <dev/pci/agpvar.h>
 
 void
diff --git a/sys/arch/macppc/pci/pchb.c b/sys/arch/macppc/pci/pchb.c
index 94e601a743f..5a8e9632656 100644
--- a/sys/arch/macppc/pci/pchb.c
+++ b/sys/arch/macppc/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.13 2012/12/22 19:07:50 mpi Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.14 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $	*/
 
 /*-
@@ -34,6 +34,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 517e4b3b7ef..7661a60dabb 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp.c,v 1.42 2014/03/17 22:01:56 kettenis Exp $ */
+/* $OpenBSD: agp.c,v 1.43 2014/03/26 14:41:41 mpi Exp $ */
 /*-
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
@@ -28,9 +28,11 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/malloc.h>
+#include <sys/rwlock.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c
index 21b0a64ae60..494bb9e5939 100644
--- a/sys/dev/pci/agp_ali.c
+++ b/sys/dev/pci/agp_ali.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_ali.c,v 1.13 2014/03/17 22:01:56 kettenis Exp $	*/
+/*	$OpenBSD: agp_ali.c,v 1.14 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: agp_ali.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $	*/
 
 
@@ -31,12 +31,10 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/lock.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c
index 1be5cff0bbc..5147ccad7c8 100644
--- a/sys/dev/pci/agp_amd.c
+++ b/sys/dev/pci/agp_amd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_amd.c,v 1.17 2014/03/17 22:01:56 kettenis Exp $	*/
+/*	$OpenBSD: agp_amd.c,v 1.18 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: agp_amd.c,v 1.6 2001/10/06 02:48:50 thorpej Exp $	*/
 
 /*-
@@ -32,10 +32,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_apple.c b/sys/dev/pci/agp_apple.c
index ffb5db02336..4769d7f54cf 100644
--- a/sys/dev/pci/agp_apple.c
+++ b/sys/dev/pci/agp_apple.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_apple.c,v 1.3 2014/03/17 22:01:56 kettenis Exp $	*/
+/*	$OpenBSD: agp_apple.c,v 1.4 2014/03/26 14:41:41 mpi Exp $	*/
 
 /*
  * Copyright (c) 2012 Martin Pieuchot <mpi@openbsd.org>
@@ -17,11 +17,10 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
+#include <sys/malloc.h>
 #include <sys/device.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index fb7339a660a..94a60ebe0d3 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_i810.c,v 1.84 2014/03/17 22:01:56 kettenis Exp $	*/
+/*	$OpenBSD: agp_i810.c,v 1.85 2014/03/26 14:41:41 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -31,10 +31,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
 #include <sys/device.h>
-#include <sys/conf.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c
index 34123b1005b..b10f321f2d1 100644
--- a/sys/dev/pci/agp_intel.c
+++ b/sys/dev/pci/agp_intel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_intel.c,v 1.21 2014/03/18 09:21:35 mpi Exp $	*/
+/*	$OpenBSD: agp_intel.c,v 1.22 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: agp_intel.c,v 1.3 2001/09/15 00:25:00 thorpej Exp $	*/
 
 /*-
@@ -32,9 +32,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
 #include <sys/device.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c
index 5d6905ab898..cbf64ac7124 100644
--- a/sys/dev/pci/agp_sis.c
+++ b/sys/dev/pci/agp_sis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_sis.c,v 1.16 2014/03/17 22:01:56 kettenis Exp $	*/
+/*	$OpenBSD: agp_sis.c,v 1.17 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: agp_sis.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $	*/
 
 /*-
@@ -32,10 +32,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c
index eb60a6a0d44..d3aa8af3ee4 100644
--- a/sys/dev/pci/agp_via.c
+++ b/sys/dev/pci/agp_via.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_via.c,v 1.18 2014/03/17 22:01:56 kettenis Exp $	*/
+/*	$OpenBSD: agp_via.c,v 1.19 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: agp_via.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $	*/
 
 /*-
@@ -32,10 +32,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agpvar.h b/sys/dev/pci/agpvar.h
index 3646d0e9120..1ac56b5c38c 100644
--- a/sys/dev/pci/agpvar.h
+++ b/sys/dev/pci/agpvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agpvar.h,v 1.29 2013/12/09 19:52:11 kettenis Exp $	*/
+/*	$OpenBSD: agpvar.h,v 1.30 2014/03/26 14:41:41 mpi Exp $	*/
 /*	$NetBSD: agpvar.h,v 1.4 2001/10/01 21:54:48 fvdl Exp $	*/
 
 /*-
@@ -32,8 +32,6 @@
 #ifndef _PCI_AGPVAR_H_
 #define _PCI_AGPVAR_H_
 
-#include <sys/rwlock.h>
-
 /* #define	AGP_DEBUG */
 #ifdef AGP_DEBUG
 #define AGP_DPF(fmt, arg...) do { printf("agp: " fmt ,##arg); } while (0)
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index e1c5d9df8cf..315cc37680c 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: drmP.h,v 1.173 2014/03/25 17:44:39 mpi Exp $ */
+/* $OpenBSD: drmP.h,v 1.174 2014/03/26 14:41:41 mpi Exp $ */
 /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
  */
@@ -52,6 +52,7 @@
 #include <sys/stdint.h>
 #include <sys/memrange.h>
 #include <sys/extent.h>
+#include <sys/rwlock.h>
 
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_object.h>
diff --git a/sys/dev/pci/mmuagp.c b/sys/dev/pci/mmuagp.c
index 4a5e07a3075..631da4e9a02 100644
--- a/sys/dev/pci/mmuagp.c
+++ b/sys/dev/pci/mmuagp.c
@@ -27,10 +27,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/rwlock.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index e8ae8f734c1..580c0e39bcb 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_pci.c,v 1.75 2014/03/17 22:01:56 kettenis Exp $ */
+/* $OpenBSD: vga_pci.c,v 1.76 2014/03/26 14:41:41 mpi Exp $ */
 /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */
 
 /*
@@ -73,6 +73,7 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/rwlock.h>
 
 #include <uvm/uvm.h>