summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2014-09-14 14:17:28 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2014-09-14 14:17:28 +0000
commitf86fd20f7920e0ce9eed94dbfa81ade1020f9bd4 (patch)
treed3e9a139df0f7b8cbe6c9989bc352cfa506c55d7 /sys/dev
parenta0c7f6a85405e690b4fe4f037a7dcb011f423de8 (diff)
remove uneeded proc.h includes
ok mpi@ kspillner@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpibat.c3
-rw-r--r--sys/dev/acpi/acpibtn.c3
-rw-r--r--sys/dev/acpi/acpicpu.c3
-rw-r--r--sys/dev/acpi/acpiec.c3
-rw-r--r--sys/dev/acpi/acpiprt.c3
-rw-r--r--sys/dev/acpi/acpipwrres.c3
-rw-r--r--sys/dev/acpi/acpisony.c3
-rw-r--r--sys/dev/acpi/acpithinkpad.c3
-rw-r--r--sys/dev/acpi/acpitoshiba.c3
-rw-r--r--sys/dev/acpi/dsdt.c3
-rw-r--r--sys/dev/ata/ata_wdc.c3
-rw-r--r--sys/dev/ata/atascsi.c3
-rw-r--r--sys/dev/ata/wd.c4
-rw-r--r--sys/dev/atapiscsi/atapiscsi.c3
-rw-r--r--sys/dev/audio.c3
-rw-r--r--sys/dev/cardbus/cardbus.c3
-rw-r--r--sys/dev/cardbus/ehci_cardbus.c3
-rw-r--r--sys/dev/cardbus/if_dc_cardbus.c3
-rw-r--r--sys/dev/cardbus/if_xl_cardbus.c3
-rw-r--r--sys/dev/cardbus/ohci_cardbus.c3
-rw-r--r--sys/dev/cardbus/uhci_cardbus.c3
-rw-r--r--sys/dev/cninit.c3
-rw-r--r--sys/dev/cons.c3
-rw-r--r--sys/dev/eisa/aha1742.c3
-rw-r--r--sys/dev/eisa/uha_eisa.c3
-rw-r--r--sys/dev/ic/acx.c3
-rw-r--r--sys/dev/ic/adv.c3
-rw-r--r--sys/dev/ic/adw.c3
-rw-r--r--sys/dev/ic/aic6360.c3
-rw-r--r--sys/dev/ic/aic79xx_openbsd.h3
-rw-r--r--sys/dev/ic/aic7xxx_openbsd.h3
-rw-r--r--sys/dev/ic/ami.c3
-rw-r--r--sys/dev/ic/an.c3
-rw-r--r--sys/dev/ic/bha.c3
-rw-r--r--sys/dev/ic/bwi.c3
-rw-r--r--sys/dev/ic/cac.c3
-rw-r--r--sys/dev/ic/ciss.c3
-rw-r--r--sys/dev/ic/com.c3
-rw-r--r--sys/dev/ic/cy.c3
-rw-r--r--sys/dev/ic/if_wi.c3
-rw-r--r--sys/dev/ic/if_wi_hostap.c3
-rw-r--r--sys/dev/ic/lpt.c3
-rw-r--r--sys/dev/ic/malo.c3
-rw-r--r--sys/dev/ic/mfi.c3
-rw-r--r--sys/dev/ic/mpi.c3
-rw-r--r--sys/dev/ic/ncr53c9x.c3
-rw-r--r--sys/dev/ic/pckbc.c3
-rw-r--r--sys/dev/ic/qla.c4
-rw-r--r--sys/dev/ic/qlw.c4
-rw-r--r--sys/dev/ic/sili.c4
-rw-r--r--sys/dev/ic/twe.c3
-rw-r--r--sys/dev/ic/uha.c3
-rw-r--r--sys/dev/ic/wdc.c3
-rw-r--r--sys/dev/ic/xl.c3
-rw-r--r--sys/dev/isa/ad1848.c3
-rw-r--r--sys/dev/isa/aha.c3
-rw-r--r--sys/dev/isa/aic_isa.c3
-rw-r--r--sys/dev/isa/ess.c3
-rw-r--r--sys/dev/isa/fd.c3
-rw-r--r--sys/dev/isa/gscsio.c3
-rw-r--r--sys/dev/isa/gus.c3
-rw-r--r--sys/dev/isa/gus_isa.c3
-rw-r--r--sys/dev/isa/gus_isapnp.c3
-rw-r--r--sys/dev/isa/ics2101.c3
-rw-r--r--sys/dev/isa/isadma.c3
-rw-r--r--sys/dev/isa/mpu401.c3
-rw-r--r--sys/dev/isa/mpu_isa.c3
-rw-r--r--sys/dev/isa/mpu_isapnp.c3
-rw-r--r--sys/dev/isa/pas.c3
-rw-r--r--sys/dev/isa/pcppi.c3
-rw-r--r--sys/dev/isa/sb.c3
-rw-r--r--sys/dev/isa/sb_isa.c3
-rw-r--r--sys/dev/isa/sb_isapnp.c3
-rw-r--r--sys/dev/isa/sbdsp.c3
-rw-r--r--sys/dev/isa/seagate.c3
-rw-r--r--sys/dev/isa/spkr.c3
-rw-r--r--sys/dev/isa/uha_isa.c3
-rw-r--r--sys/dev/isa/wds.c3
-rw-r--r--sys/dev/isa/wss.c3
-rw-r--r--sys/dev/isa/wss_isa.c3
-rw-r--r--sys/dev/isa/wss_isapnp.c3
-rw-r--r--sys/dev/isa/ym.c3
-rw-r--r--sys/dev/isa/ym_isapnp.c3
-rw-r--r--sys/dev/microcode/adw/adwmcode.c3
-rw-r--r--sys/dev/midi.c3
-rw-r--r--sys/dev/mii/eephy.c3
-rw-r--r--sys/dev/mii/mii_physubr.c3
-rw-r--r--sys/dev/onewire/onewire.c3
-rw-r--r--sys/dev/onewire/owctr.c3
-rw-r--r--sys/dev/onewire/owid.c3
-rw-r--r--sys/dev/onewire/owsbm.c3
-rw-r--r--sys/dev/onewire/owtemp.c3
-rw-r--r--sys/dev/pci/bktr/bktr_audio.c3
-rw-r--r--sys/dev/pci/bktr/bktr_tuner.c3
-rw-r--r--sys/dev/pci/glxpcib.c3
-rw-r--r--sys/dev/pci/if_art.c3
-rw-r--r--sys/dev/pci/if_lmc.c3
-rw-r--r--sys/dev/pci/if_myx.c3
-rw-r--r--sys/dev/pci/if_san_common.c3
-rw-r--r--sys/dev/pci/if_san_obsd.c3
-rw-r--r--sys/dev/pci/if_san_xilinx.c3
-rw-r--r--sys/dev/pci/pci.c3
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c3
-rw-r--r--sys/dev/pcmcia/if_malo.c3
-rw-r--r--sys/dev/pcmcia/wdc_pcmcia.c3
-rw-r--r--sys/dev/puc/com_puc.c3
-rw-r--r--sys/dev/radio.c3
-rw-r--r--sys/dev/sdmmc/sdmmc.c3
-rw-r--r--sys/dev/sdmmc/sdmmc_io.c3
-rw-r--r--sys/dev/sdmmc/sdmmc_scsi.c3
-rw-r--r--sys/dev/softraid.c3
-rw-r--r--sys/dev/softraid_crypto.c3
-rw-r--r--sys/dev/softraid_raid0.c3
-rw-r--r--sys/dev/softraid_raid1.c3
-rw-r--r--sys/dev/softraid_raid5.c3
-rw-r--r--sys/dev/softraid_raid6.c3
-rw-r--r--sys/dev/video.c3
-rw-r--r--sys/dev/vscsi.c3
-rw-r--r--sys/dev/wscons/wsdisplay.c3
-rw-r--r--sys/dev/wscons/wsevent.c3
120 files changed, 124 insertions, 240 deletions
diff --git a/sys/dev/acpi/acpibat.c b/sys/dev/acpi/acpibat.c
index 093be741466..f7b144e62af 100644
--- a/sys/dev/acpi/acpibat.c
+++ b/sys/dev/acpi/acpibat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpibat.c,v 1.60 2014/05/23 19:17:39 landry Exp $ */
+/* $OpenBSD: acpibat.c,v 1.61 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
diff --git a/sys/dev/acpi/acpibtn.c b/sys/dev/acpi/acpibtn.c
index f9369b74730..a31403ae432 100644
--- a/sys/dev/acpi/acpibtn.c
+++ b/sys/dev/acpi/acpibtn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpibtn.c,v 1.35 2013/08/21 20:10:47 landry Exp $ */
+/* $OpenBSD: acpibtn.c,v 1.36 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c
index 56eae560a76..3aee7f2d3ae 100644
--- a/sys/dev/acpi/acpicpu.c
+++ b/sys/dev/acpi/acpicpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpicpu.c,v 1.60 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: acpicpu.c,v 1.61 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c
index 8be0cac8c99..380d0013d32 100644
--- a/sys/dev/acpi/acpiec.c
+++ b/sys/dev/acpi/acpiec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiec.c,v 1.50 2014/06/25 07:46:14 kettenis Exp $ */
+/* $OpenBSD: acpiec.c,v 1.51 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/acpi/acpiprt.c b/sys/dev/acpi/acpiprt.c
index b0099e74055..222dd620849 100644
--- a/sys/dev/acpi/acpiprt.c
+++ b/sys/dev/acpi/acpiprt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiprt.c,v 1.45 2014/05/02 14:10:15 kettenis Exp $ */
+/* $OpenBSD: acpiprt.c,v 1.46 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org>
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/acpi/acpipwrres.c b/sys/dev/acpi/acpipwrres.c
index 275e699ee33..c7d103f78a2 100644
--- a/sys/dev/acpi/acpipwrres.c
+++ b/sys/dev/acpi/acpipwrres.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpipwrres.c,v 1.6 2013/12/17 15:18:28 deraadt Exp $ */
+/* $OpenBSD: acpipwrres.c,v 1.7 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2013 Martin Pieuchot <mpi@openbsd.org>
@@ -18,7 +18,6 @@
*/
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/acpi/acpisony.c b/sys/dev/acpi/acpisony.c
index 89ba16f1b7d..e26e0ef750a 100644
--- a/sys/dev/acpi/acpisony.c
+++ b/sys/dev/acpi/acpisony.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpisony.c,v 1.5 2014/02/21 18:49:06 deraadt Exp $ */
+/* $OpenBSD: acpisony.c,v 1.6 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2010 Paul Irofti <pirofti@openbsd.org>
*
@@ -17,7 +17,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c
index b828cd3d480..cfcce695311 100644
--- a/sys/dev/acpi/acpithinkpad.c
+++ b/sys/dev/acpi/acpithinkpad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpithinkpad.c,v 1.36 2014/07/08 21:32:15 miod Exp $ */
+/* $OpenBSD: acpithinkpad.c,v 1.37 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2008 joshua stein <jcs@openbsd.org>
*
@@ -17,7 +17,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff --git a/sys/dev/acpi/acpitoshiba.c b/sys/dev/acpi/acpitoshiba.c
index ce5ea0f84eb..bd66a6b4376 100644
--- a/sys/dev/acpi/acpitoshiba.c
+++ b/sys/dev/acpi/acpitoshiba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitoshiba.c,v 1.2 2011/06/17 01:27:41 krw Exp $ */
+/* $OpenBSD: acpitoshiba.c,v 1.3 2014/09/14 14:17:24 jsg Exp $ */
/*-
* Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org>
* All rights reserved.
@@ -27,7 +27,6 @@
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index 20dd8af22d7..ee2498f606d 100644
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.213 2014/07/20 12:20:38 kettenis Exp $ */
+/* $OpenBSD: dsdt.c,v 1.214 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
*
@@ -20,7 +20,6 @@
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 1f52488b1ae..d5e37a65f2c 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ata_wdc.c,v 1.46 2013/11/06 12:06:58 deraadt Exp $ */
+/* $OpenBSD: ata_wdc.c,v 1.47 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $ */
/*
@@ -66,7 +66,6 @@
#include <sys/disklabel.h>
#include <sys/disk.h>
#include <sys/syslog.h>
-#include <sys/proc.h>
#include <machine/intr.h>
#include <machine/bus.h>
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index bd75eece59f..0bb75405cd3 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atascsi.c,v 1.119 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: atascsi.c,v 1.120 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/pool.h>
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 3b0c33b0cec..cf44fc37fe5 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wd.c,v 1.116 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: wd.c,v 1.117 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
/*
@@ -73,7 +73,7 @@
#include <sys/disklabel.h>
#include <sys/disk.h>
#include <sys/syslog.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/vnode.h>
#include <sys/dkio.h>
#include <sys/reboot.h>
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index 933a5408b19..df5c45b13d4 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atapiscsi.c,v 1.102 2014/01/19 00:03:13 dlg Exp $ */
+/* $OpenBSD: atapiscsi.c,v 1.103 2014/09/14 14:17:24 jsg Exp $ */
/*
* This code is derived from code with the copyright below.
@@ -38,7 +38,6 @@
#include <sys/buf.h>
#include <sys/disklabel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/file.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index a9fa22b6496..d522504f859 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: audio.c,v 1.122 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: audio.c,v 1.123 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/selinfo.h>
#include <sys/poll.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/kernel.h>
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 3534040a5ac..f7fb7b0315b 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardbus.c,v 1.47 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: cardbus.c,v 1.48 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */
/*
@@ -34,7 +34,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index d757ce5828d..e044ec7864c 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci_cardbus.c,v 1.19 2014/05/17 12:54:57 stsp Exp $ */
+/* $OpenBSD: ehci_cardbus.c,v 1.20 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $ */
/*
@@ -36,7 +36,6 @@
#include <sys/kernel.h>
#include <sys/rwlock.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c
index cfae7fa3c68..6b5e15fbf48 100644
--- a/sys/dev/cardbus/if_dc_cardbus.c
+++ b/sys/dev/cardbus/if_dc_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_dc_cardbus.c,v 1.35 2011/04/02 17:47:04 jasper Exp $ */
+/* $OpenBSD: if_dc_cardbus.c,v 1.36 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -42,7 +42,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <net/if.h>
diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c
index 5326d6123da..87d6847a21a 100644
--- a/sys/dev/cardbus/if_xl_cardbus.c
+++ b/sys/dev/cardbus/if_xl_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xl_cardbus.c,v 1.29 2014/08/11 12:45:45 mpi Exp $ */
+/* $OpenBSD: if_xl_cardbus.c,v 1.30 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <net/if.h>
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index eab2f310964..fd5fafd68b8 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci_cardbus.c,v 1.19 2014/05/16 18:17:03 mpi Exp $ */
+/* $OpenBSD: ohci_cardbus.c,v 1.20 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index df2c0c6161a..5004ddf73ef 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci_cardbus.c,v 1.13 2014/05/16 18:17:03 mpi Exp $ */
+/* $OpenBSD: uhci_cardbus.c,v 1.14 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/cninit.c b/sys/dev/cninit.c
index 11fa949ae6b..e675680c0a6 100644
--- a/sys/dev/cninit.c
+++ b/sys/dev/cninit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cninit.c,v 1.12 2013/09/29 12:56:31 kettenis Exp $ */
+/* $OpenBSD: cninit.c,v 1.13 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: cninit.c,v 1.2 1995/04/11 22:08:10 pk Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index 412533746ff..5ba0be901ec 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.c,v 1.23 2011/07/04 16:52:41 nicm Exp $ */
+/* $OpenBSD: cons.c,v 1.24 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: cons.c,v 1.30 1996/04/08 19:57:30 jonathan Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c
index 6fc6e28b79a..2a7b67f56b5 100644
--- a/sys/dev/eisa/aha1742.c
+++ b/sys/dev/eisa/aha1742.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha1742.c,v 1.43 2011/04/05 14:51:57 krw Exp $ */
+/* $OpenBSD: aha1742.c,v 1.44 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */
/*
@@ -56,7 +56,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index 711460682ba..4a9b851d7eb 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha_eisa.c,v 1.12 2010/08/07 03:50:01 krw Exp $ */
+/* $OpenBSD: uha_eisa.c,v 1.13 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $ */
/*
@@ -35,7 +35,6 @@
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index de3e0bbeaa1..00743be42db 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx.c,v 1.106 2014/09/08 07:21:40 kettenis Exp $ */
+/* $OpenBSD: acx.c,v 1.107 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -93,7 +93,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 7ac7ddd5a5c..0040b999a02 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv.c,v 1.35 2011/07/04 07:47:43 jsg Exp $ */
+/* $OpenBSD: adv.c,v 1.36 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@@ -40,7 +40,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index f6ee7e197a4..f44caa07d2f 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw.c,v 1.50 2012/01/11 16:22:32 dhill Exp $ */
+/* $OpenBSD: adw.c,v 1.51 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -40,7 +40,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/timeout.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 1c77a61021e..531b187056d 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic6360.c,v 1.26 2011/04/03 12:42:36 krw Exp $ */
+/* $OpenBSD: aic6360.c,v 1.27 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
#ifdef DDB
@@ -130,7 +130,6 @@
#include <sys/ioctl.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/aic79xx_openbsd.h b/sys/dev/ic/aic79xx_openbsd.h
index b6df42a1310..1f9b02c7e46 100644
--- a/sys/dev/ic/aic79xx_openbsd.h
+++ b/sys/dev/ic/aic79xx_openbsd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx_openbsd.h,v 1.17 2007/10/01 12:10:55 martin Exp $ */
+/* $OpenBSD: aic79xx_openbsd.h,v 1.18 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -74,7 +74,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#define AIC_PCI_CONFIG 1
diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h
index 4c31dffbb9c..afff012e2f2 100644
--- a/sys/dev/ic/aic7xxx_openbsd.h
+++ b/sys/dev/ic/aic7xxx_openbsd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx_openbsd.h,v 1.23 2012/02/12 14:30:51 deraadt Exp $ */
+/* $OpenBSD: aic7xxx_openbsd.h,v 1.24 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: aic7xxx_osm.h,v 1.7 2003/11/02 11:07:44 wiz Exp $ */
/*
@@ -52,7 +52,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 9ea85f29e2c..98afef3411f 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami.c,v 1.228 2014/07/13 23:10:23 deraadt Exp $ */
+/* $OpenBSD: ami.c,v 1.229 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -57,7 +57,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/pool.h>
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index e53dc521565..685bf868852 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: an.c,v 1.61 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: an.c,v 1.62 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -88,7 +88,6 @@
#include <sys/socket.h>
#include <sys/timeout.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/endian.h>
#include <sys/tree.h>
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index 8e71b070cad..f0ac3d58fca 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bha.c,v 1.29 2011/07/04 07:47:42 jsg Exp $ */
+/* $OpenBSD: bha.c,v 1.30 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */
#undef BHADEBUG
@@ -62,7 +62,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index f6d6383d1a2..e526f2837ff 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwi.c,v 1.109 2014/09/06 05:41:35 jsg Exp $ */
+/* $OpenBSD: bwi.c,v 1.110 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -45,7 +45,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 435dd477946..af0cc9dc7b0 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cac.c,v 1.52 2014/07/13 23:10:23 deraadt Exp $ */
+/* $OpenBSD: cac.c,v 1.53 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $ */
/*
@@ -72,7 +72,6 @@
#include <sys/ioctl.h>
#include <sys/device.h>
#include <sys/queue.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/endian.h>
#include <sys/malloc.h>
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 614d4fecc42..33cc0bd4ec5 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciss.c,v 1.70 2014/07/13 23:10:23 deraadt Exp $ */
+/* $OpenBSD: ciss.c,v 1.71 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2005,2006 Michael Shalayeff
@@ -28,7 +28,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 91f9cf6be75..000eea37cb9 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com.c,v 1.157 2014/04/13 15:42:32 deraadt Exp $ */
+/* $OpenBSD: com.c,v 1.158 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -67,7 +67,6 @@
#include <sys/ioctl.h>
#include <sys/selinfo.h>
#include <sys/tty.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index 8a2cf8712e7..7e3fa7a6f42 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cy.c,v 1.33 2010/11/18 21:15:15 miod Exp $ */
+/* $OpenBSD: cy.c,v 1.34 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 1996 Timo Rossi.
* All rights reserved.
@@ -56,7 +56,6 @@
#include <sys/syslog.h>
#include <sys/fcntl.h>
#include <sys/tty.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/selinfo.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 54f0d417327..2cf14762ea1 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.156 2014/07/22 13:12:12 mpi Exp $ */
+/* $OpenBSD: if_wi.c,v 1.157 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -70,7 +70,6 @@
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index 0a47b6a0f16..e56fdfb245e 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_hostap.c,v 1.45 2014/09/13 16:06:37 doug Exp $ */
+/* $OpenBSD: if_wi_hostap.c,v 1.46 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2002
@@ -46,7 +46,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/timeout.h>
-#include <sys/proc.h>
#include <sys/ucred.h>
#include <sys/socket.h>
#include <sys/queue.h>
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index 235940e3868..9d6eebe1c2d 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpt.c,v 1.11 2013/12/09 04:21:58 deraadt Exp $ */
+/* $OpenBSD: lpt.c,v 1.12 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: lpt.c,v 1.42 1996/10/21 22:41:14 thorpej Exp $ */
/*
@@ -56,7 +56,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/kernel.h>
#include <sys/uio.h>
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index d906c4962a9..19397c65bb1 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malo.c,v 1.101 2014/07/22 13:12:12 mpi Exp $ */
+/* $OpenBSD: malo.c,v 1.102 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -26,7 +26,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index ef97bc86cbc..a5eea693a38 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.156 2014/09/09 03:08:30 dlg Exp $ */
+/* $OpenBSD: mfi.c,v 1.157 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
*
@@ -25,7 +25,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/sensors.h>
#include <sys/pool.h>
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index b59de4e37d2..a42503bfa99 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpi.c,v 1.195 2014/09/03 00:46:04 dlg Exp $ */
+/* $OpenBSD: mpi.c,v 1.196 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/mutex.h>
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 91211103d41..712cf557d9e 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr53c9x.c,v 1.58 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: ncr53c9x.c,v 1.59 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */
/*
@@ -74,7 +74,6 @@
#include <sys/device.h>
#include <sys/buf.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/pool.h>
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index 6d4ebe6b1f7..668f2cf2651 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.38 2014/07/07 18:20:15 shadchin Exp $ */
+/* $OpenBSD: pckbc.c,v 1.39 2014/09/14 14:17:24 jsg Exp $ */
/* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
/*
@@ -30,7 +30,6 @@
#include <sys/systm.h>
#include <sys/timeout.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/errno.h>
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c
index d0bd9eb69db..2a23a4b6740 100644
--- a/sys/dev/ic/qla.c
+++ b/sys/dev/ic/qla.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qla.c,v 1.44 2014/09/13 16:06:37 doug Exp $ */
+/* $OpenBSD: qla.c,v 1.45 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -22,7 +22,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/mutex.h>
@@ -30,6 +29,7 @@
#include <sys/sensors.h>
#include <sys/queue.h>
+#include <machine/atomic.h>
#include <machine/bus.h>
#include <scsi/scsi_all.h>
diff --git a/sys/dev/ic/qlw.c b/sys/dev/ic/qlw.c
index 86c32bd5125..6180f1006bb 100644
--- a/sys/dev/ic/qlw.c
+++ b/sys/dev/ic/qlw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qlw.c,v 1.24 2014/07/13 23:10:23 deraadt Exp $ */
+/* $OpenBSD: qlw.c,v 1.25 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -23,7 +23,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/mutex.h>
@@ -31,6 +30,7 @@
#include <sys/sensors.h>
#include <sys/queue.h>
+#include <machine/atomic.h>
#include <machine/bus.h>
#include <scsi/scsi_all.h>
diff --git a/sys/dev/ic/sili.c b/sys/dev/ic/sili.c
index 4f6f0771568..ada875c50bb 100644
--- a/sys/dev/ic/sili.c
+++ b/sys/dev/ic/sili.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sili.c,v 1.53 2014/07/13 23:10:23 deraadt Exp $ */
+/* $OpenBSD: sili.c,v 1.54 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -22,7 +22,7 @@
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/mutex.h>
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index 21ee1102166..8f47b0650fa 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: twe.c,v 1.43 2013/11/18 23:32:23 deraadt Exp $ */
+/* $OpenBSD: twe.c,v 1.44 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2000-2002 Michael Shalayeff. All rights reserved.
@@ -36,7 +36,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/kthread.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 4a0a8e4d582..1469f972d6e 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha.c,v 1.23 2011/10/25 15:48:06 krw Exp $ */
+/* $OpenBSD: uha.c,v 1.24 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@@ -68,7 +68,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index fc0a664bf78..6ba24bab0b0 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc.c,v 1.125 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: wdc.c,v 1.126 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -61,7 +61,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
-#include <sys/proc.h>
#include <sys/disk.h>
#include <sys/pool.h>
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index cbee422edff..ee125e24f82 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xl.c,v 1.115 2014/07/22 13:12:12 mpi Exp $ */
+/* $OpenBSD: xl.c,v 1.116 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -111,7 +111,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */
#include <sys/device.h>
#include <net/if.h>
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c
index 45cfa9b7a2d..96a23c45e6c 100644
--- a/sys/dev/isa/ad1848.c
+++ b/sys/dev/isa/ad1848.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ad1848.c,v 1.39 2013/05/15 08:29:24 ratchov Exp $ */
+/* $OpenBSD: ad1848.c,v 1.40 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */
/*
@@ -73,7 +73,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <machine/cpu.h>
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 9488aff583d..3b142cbaa37 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha.c,v 1.76 2014/03/28 17:57:11 mpi Exp $ */
+/* $OpenBSD: aha.c,v 1.77 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */
#undef AHADIAG
@@ -56,7 +56,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/timeout.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index 04b0797c562..8e23b412809 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic_isa.c,v 1.6 2010/06/26 23:24:44 guenther Exp $ */
+/* $OpenBSD: aic_isa.c,v 1.7 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
/*
@@ -59,7 +59,6 @@
#include <sys/ioctl.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index 73375d6d74d..0aec993d924 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ess.c,v 1.19 2013/11/15 16:46:27 brad Exp $ */
+/* $OpenBSD: ess.c,v 1.20 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */
/*
@@ -72,7 +72,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/timeout.h>
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index e159e700bd7..a0b863b6e54 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.100 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: fd.c,v 1.101 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */
/*-
@@ -54,7 +54,6 @@
#include <sys/malloc.h>
#include <sys/uio.h>
#include <sys/mtio.h>
-#include <sys/proc.h>
#include <sys/syslog.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/sys/dev/isa/gscsio.c b/sys/dev/isa/gscsio.c
index 944d7de26c2..8e0665439b0 100644
--- a/sys/dev/isa/gscsio.c
+++ b/sys/dev/isa/gscsio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gscsio.c,v 1.12 2010/02/16 00:05:23 mk Exp $ */
+/* $OpenBSD: gscsio.c,v 1.13 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
*
@@ -25,7 +25,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 4358c94b90d..ea3abdfc068 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gus.c,v 1.40 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: gus.c,v 1.41 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
/*-
@@ -94,7 +94,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
diff --git a/sys/dev/isa/gus_isa.c b/sys/dev/isa/gus_isa.c
index 353539b3927..6da7f083a4e 100644
--- a/sys/dev/isa/gus_isa.c
+++ b/sys/dev/isa/gus_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gus_isa.c,v 1.5 2008/06/26 05:42:16 ray Exp $ */
+/* $OpenBSD: gus_isa.c,v 1.6 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
/*-
@@ -94,7 +94,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
diff --git a/sys/dev/isa/gus_isapnp.c b/sys/dev/isa/gus_isapnp.c
index 931ef7b677f..0aa3f15be33 100644
--- a/sys/dev/isa/gus_isapnp.c
+++ b/sys/dev/isa/gus_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gus_isapnp.c,v 1.6 2012/02/26 11:36:45 miod Exp $ */
+/* $OpenBSD: gus_isapnp.c,v 1.7 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
/*-
@@ -94,7 +94,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
diff --git a/sys/dev/isa/ics2101.c b/sys/dev/isa/ics2101.c
index 925af05f29c..009a9819374 100644
--- a/sys/dev/isa/ics2101.c
+++ b/sys/dev/isa/ics2101.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ics2101.c,v 1.8 2013/05/15 08:29:24 ratchov Exp $ */
+/* $OpenBSD: ics2101.c,v 1.9 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: ics2101.c,v 1.6 1997/10/09 07:57:23 jtc Exp $ */
/*-
@@ -36,7 +36,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <machine/cpu.h>
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 74b73896a44..f79150c2f7e 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isadma.c,v 1.32 2014/07/12 18:48:18 tedu Exp $ */
+/* $OpenBSD: isadma.c,v 1.33 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c
index adc4c714aea..062dce67dc6 100644
--- a/sys/dev/isa/mpu401.c
+++ b/sys/dev/isa/mpu401.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpu401.c,v 1.13 2013/05/15 08:29:24 ratchov Exp $ */
+/* $OpenBSD: mpu401.c,v 1.14 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $ */
/*
@@ -36,7 +36,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <machine/cpu.h>
diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c
index 5e3fa5bcb6b..09223ad3589 100644
--- a/sys/dev/isa/mpu_isa.c
+++ b/sys/dev/isa/mpu_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpu_isa.c,v 1.4 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: mpu_isa.c,v 1.5 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2002 Sergey Smitienko. All rights reserved.
@@ -33,7 +33,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/mpu_isapnp.c b/sys/dev/isa/mpu_isapnp.c
index ac274f84ad9..febf0a769ad 100644
--- a/sys/dev/isa/mpu_isapnp.c
+++ b/sys/dev/isa/mpu_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpu_isapnp.c,v 1.7 2013/05/24 07:58:46 ratchov Exp $ */
+/* $OpenBSD: mpu_isapnp.c,v 1.8 2014/09/14 14:17:25 jsg Exp $ */
#include "midi.h"
@@ -8,7 +8,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index f252fd2f3c6..b951ccfd7d7 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pas.c,v 1.26 2013/05/24 07:58:46 ratchov Exp $ */
+/* $OpenBSD: pas.c,v 1.27 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $ */
/*
@@ -53,7 +53,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/cpu.h>
#include <machine/intr.h>
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c
index f7b4ff070af..761ed89b5d9 100644
--- a/sys/dev/isa/pcppi.c
+++ b/sys/dev/isa/pcppi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcppi.c,v 1.10 2010/08/20 02:34:15 deraadt Exp $ */
+/* $OpenBSD: pcppi.c,v 1.11 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: pcppi.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
/*
@@ -31,7 +31,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/errno.h>
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index f563781479d..3b93243232a 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sb.c,v 1.26 2013/05/24 07:58:46 ratchov Exp $ */
+/* $OpenBSD: sb.c,v 1.27 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/cpu.h>
#include <machine/intr.h>
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index 6fad97cbed1..d2879a4a34b 100644
--- a/sys/dev/isa/sb_isa.c
+++ b/sys/dev/isa/sb_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sb_isa.c,v 1.8 2006/01/02 05:21:40 brad Exp $ */
+/* $OpenBSD: sb_isa.c,v 1.9 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: sb_isa.c,v 1.15 1997/11/30 15:32:25 drochner Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/sb_isapnp.c b/sys/dev/isa/sb_isapnp.c
index 9d251bff7f9..06c3fbfdd46 100644
--- a/sys/dev/isa/sb_isapnp.c
+++ b/sys/dev/isa/sb_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sb_isapnp.c,v 1.13 2002/03/14 01:26:56 millert Exp $ */
+/* $OpenBSD: sb_isapnp.c,v 1.14 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: sb_isa.c,v 1.3 1997/03/20 11:03:11 mycroft Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index c5709065105..594fd067418 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbdsp.c,v 1.33 2013/05/15 08:29:24 ratchov Exp $ */
+/* $OpenBSD: sbdsp.c,v 1.34 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -52,7 +52,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <machine/cpu.h>
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 2fadd46f56f..d79e071d235 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: seagate.c,v 1.37 2011/04/03 12:42:36 krw Exp $ */
+/* $OpenBSD: seagate.c,v 1.38 2014/09/14 14:17:25 jsg Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -72,7 +72,6 @@
#include <sys/ioctl.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/malloc.h>
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 085eb98a769..7802d71324d 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkr.c,v 1.16 2014/07/12 18:48:18 tedu Exp $ */
+/* $OpenBSD: spkr.c,v 1.17 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
/*
@@ -50,7 +50,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/uio.h>
-#include <sys/proc.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/file.h>
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c
index 8dd1c1e14ac..63e31145f5f 100644
--- a/sys/dev/isa/uha_isa.c
+++ b/sys/dev/isa/uha_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha_isa.c,v 1.11 2010/06/26 23:24:44 guenther Exp $ */
+/* $OpenBSD: uha_isa.c,v 1.12 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: uha_isa.c,v 1.5 1996/10/21 22:41:21 thorpej Exp $ */
/*
@@ -35,7 +35,6 @@
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index f6166388d6f..96668c2e100 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.41 2014/04/28 10:06:37 jsg Exp $ */
+/* $OpenBSD: wds.c,v 1.42 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -66,7 +66,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index 53ecf9f2a52..41602d67282 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wss.c,v 1.26 2013/05/24 07:58:46 ratchov Exp $ */
+/* $OpenBSD: wss.c,v 1.27 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: wss.c,v 1.42 1998/01/19 22:18:23 augustss Exp $ */
/*
@@ -42,7 +42,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <machine/cpu.h>
diff --git a/sys/dev/isa/wss_isa.c b/sys/dev/isa/wss_isa.c
index 83a52e207c3..ea328fe4b1e 100644
--- a/sys/dev/isa/wss_isa.c
+++ b/sys/dev/isa/wss_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wss_isa.c,v 1.5 2006/01/02 05:21:40 brad Exp $ */
+/* $OpenBSD: wss_isa.c,v 1.6 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: wss_isa.c,v 1.1 1998/01/19 22:18:24 augustss Exp $ */
/*
@@ -46,7 +46,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <machine/cpu.h>
diff --git a/sys/dev/isa/wss_isapnp.c b/sys/dev/isa/wss_isapnp.c
index 2ea7f368135..c46630415e9 100644
--- a/sys/dev/isa/wss_isapnp.c
+++ b/sys/dev/isa/wss_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wss_isapnp.c,v 1.8 2009/06/21 00:38:22 martynas Exp $ */
+/* $OpenBSD: wss_isapnp.c,v 1.9 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: wss_isapnp.c,v 1.5 1998/11/25 22:17:07 augustss Exp $ */
/*
@@ -36,7 +36,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c
index a11a9f0cc47..e78ab41a72f 100644
--- a/sys/dev/isa/ym.c
+++ b/sys/dev/isa/ym.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ym.c,v 1.18 2013/05/24 07:58:46 ratchov Exp $ */
+/* $OpenBSD: ym.c,v 1.19 2014/09/14 14:17:25 jsg Exp $ */
/*
@@ -35,7 +35,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <machine/cpu.h>
diff --git a/sys/dev/isa/ym_isapnp.c b/sys/dev/isa/ym_isapnp.c
index 606b8ec2687..55e644cc2a9 100644
--- a/sys/dev/isa/ym_isapnp.c
+++ b/sys/dev/isa/ym_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ym_isapnp.c,v 1.9 2010/06/30 11:21:35 jakemsr Exp $ */
+/* $OpenBSD: ym_isapnp.c,v 1.10 2014/09/14 14:17:25 jsg Exp $ */
/*
@@ -40,7 +40,6 @@
#include <sys/ioctl.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/microcode/adw/adwmcode.c b/sys/dev/microcode/adw/adwmcode.c
index 7045fb46204..9773c19b908 100644
--- a/sys/dev/microcode/adw/adwmcode.c
+++ b/sys/dev/microcode/adw/adwmcode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adwmcode.c,v 1.5 2011/04/07 15:30:16 miod Exp $ */
+/* $OpenBSD: adwmcode.c,v 1.6 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: adwmcode.c,v 1.5 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -57,7 +57,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index 48f172a64be..33d3130bff8 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: midi.c,v 1.30 2013/05/15 08:29:24 ratchov Exp $ */
+/* $OpenBSD: midi.c,v 1.31 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2003, 2004 Alexandre Ratchov
@@ -23,7 +23,6 @@
#include <sys/exec.h>
#include <sys/conf.h>
#include <sys/lkm.h>
-#include <sys/proc.h>
#include <sys/poll.h>
#include <sys/kernel.h>
#include <sys/timeout.h>
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index f4c7c078a5b..b6d19d61dbd 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eephy.c,v 1.53 2013/12/28 20:32:16 brad Exp $ */
+/* $OpenBSD: eephy.c,v 1.54 2014/09/14 14:17:25 jsg Exp $ */
/*
* Principal Author: Parag Patel
* Copyright (c) 2001
@@ -45,7 +45,6 @@
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/socket.h>
-#include <sys/proc.h>
#include <net/if.h>
#include <net/if_media.h>
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index ca499787b67..b11497a5b59 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mii_physubr.c,v 1.42 2013/12/28 03:30:41 deraadt Exp $ */
+/* $OpenBSD: mii_physubr.c,v 1.43 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $ */
/*-
@@ -41,7 +41,6 @@
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/errno.h>
-#include <sys/proc.h>
#include <net/if.h>
#include <net/if_media.h>
diff --git a/sys/dev/onewire/onewire.c b/sys/dev/onewire/onewire.c
index cd7f94bbe4c..e7ab03d57ab 100644
--- a/sys/dev/onewire/onewire.c
+++ b/sys/dev/onewire/onewire.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: onewire.c,v 1.15 2014/07/12 18:48:51 tedu Exp $ */
+/* $OpenBSD: onewire.c,v 1.16 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -26,7 +26,6 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/rwlock.h>
diff --git a/sys/dev/onewire/owctr.c b/sys/dev/onewire/owctr.c
index 5b47ac922bb..46c4f349efd 100644
--- a/sys/dev/onewire/owctr.c
+++ b/sys/dev/onewire/owctr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: owctr.c,v 1.5 2014/07/12 18:48:51 tedu Exp $ */
+/* $OpenBSD: owctr.c,v 1.6 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2010 John L. Scarfone <john@scarfone.net>
*
@@ -27,7 +27,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/sensors.h>
diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c
index 358330d05dc..b0f2f2a64de 100644
--- a/sys/dev/onewire/owid.c
+++ b/sys/dev/onewire/owid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: owid.c,v 1.9 2011/07/03 15:47:16 matthew Exp $ */
+/* $OpenBSD: owid.c,v 1.10 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/sensors.h>
#include <dev/onewire/onewiredevs.h>
diff --git a/sys/dev/onewire/owsbm.c b/sys/dev/onewire/owsbm.c
index 10d6d2835d1..2b19a00477a 100644
--- a/sys/dev/onewire/owsbm.c
+++ b/sys/dev/onewire/owsbm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: owsbm.c,v 1.8 2010/07/08 07:19:54 jasper Exp $ */
+/* $OpenBSD: owsbm.c,v 1.9 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2007 Aaron Linville <aaron@linville.org>
@@ -27,7 +27,6 @@
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/sensors.h>
diff --git a/sys/dev/onewire/owtemp.c b/sys/dev/onewire/owtemp.c
index eb7ccee708c..e883dbb17a9 100644
--- a/sys/dev/onewire/owtemp.c
+++ b/sys/dev/onewire/owtemp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: owtemp.c,v 1.15 2010/07/08 07:19:54 jasper Exp $ */
+/* $OpenBSD: owtemp.c,v 1.16 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2006, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/sensors.h>
diff --git a/sys/dev/pci/bktr/bktr_audio.c b/sys/dev/pci/bktr/bktr_audio.c
index cbf45399157..6deb2b7aa32 100644
--- a/sys/dev/pci/bktr/bktr_audio.c
+++ b/sys/dev/pci/bktr/bktr_audio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_audio.c,v 1.10 2008/09/25 19:09:16 chl Exp $ */
+/* $OpenBSD: bktr_audio.c,v 1.11 2014/09/14 14:17:25 jsg Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.8 2000/10/31 13:09:56 roger Exp $ */
/*
* This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -51,7 +51,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
-#include <sys/proc.h>
#include <dev/ic/bt8xx.h> /* OpenBSD location of .h files */
#include <dev/pci/bktr/bktr_reg.h>
diff --git a/sys/dev/pci/bktr/bktr_tuner.c b/sys/dev/pci/bktr/bktr_tuner.c
index b3d307823ff..013b0be4a68 100644
--- a/sys/dev/pci/bktr/bktr_tuner.c
+++ b/sys/dev/pci/bktr/bktr_tuner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_tuner.c,v 1.6 2007/06/11 08:10:22 robert Exp $ */
+/* $OpenBSD: bktr_tuner.c,v 1.7 2014/09/14 14:17:25 jsg Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.9 2000/10/19 07:33:28 roger Exp $ */
/*
@@ -50,7 +50,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
-#include <sys/proc.h>
#include <dev/ic/bt8xx.h> /* OpenBSD .h file location */
#include <dev/pci/bktr/bktr_reg.h>
diff --git a/sys/dev/pci/glxpcib.c b/sys/dev/pci/glxpcib.c
index ee82e1e0bdd..954ded89bba 100644
--- a/sys/dev/pci/glxpcib.c
+++ b/sys/dev/pci/glxpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glxpcib.c,v 1.11 2013/12/06 21:03:03 deraadt Exp $ */
+/* $OpenBSD: glxpcib.c,v 1.12 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/gpio.h>
#include <sys/timetc.h>
diff --git a/sys/dev/pci/if_art.c b/sys/dev/pci/if_art.c
index 03f332aac76..df71aade7bf 100644
--- a/sys/dev/pci/if_art.c
+++ b/sys/dev/pci/if_art.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_art.c,v 1.20 2013/06/20 12:03:40 mpi Exp $ */
+/* $OpenBSD: if_art.c,v 1.21 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2004,2005 Internet Business Solutions AG, Zurich, Switzerland
@@ -21,7 +21,6 @@
#include <sys/types.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/syslog.h>
diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c
index 5f1b3a5b3ed..0e0734f8056 100644
--- a/sys/dev/pci/if_lmc.c
+++ b/sys/dev/pci/if_lmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lmc.c,v 1.25 2011/07/07 20:42:56 henning Exp $ */
+/* $OpenBSD: if_lmc.c,v 1.26 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: if_lmc.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */
/*-
@@ -89,7 +89,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c
index 8d1ce665256..4d2cb4c4469 100644
--- a/sys/dev/pci/if_myx.c
+++ b/sys/dev/pci/if_myx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_myx.c,v 1.63 2014/08/19 11:13:16 dlg Exp $ */
+/* $OpenBSD: if_myx.c,v 1.64 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -31,7 +31,6 @@
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/timeout.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/queue.h>
diff --git a/sys/dev/pci/if_san_common.c b/sys/dev/pci/if_san_common.c
index 4614e92aa50..1cb4a0a7edc 100644
--- a/sys/dev/pci/if_san_common.c
+++ b/sys/dev/pci/if_san_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_san_common.c,v 1.19 2014/09/08 06:24:13 jsg Exp $ */
+/* $OpenBSD: if_san_common.c,v 1.20 2014/09/14 14:17:25 jsg Exp $ */
/*-
* Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -43,7 +43,6 @@
# include <sys/errno.h>
# include <sys/exec.h>
# include <sys/mbuf.h>
-# include <sys/proc.h>
# include <sys/socket.h>
# include <sys/kernel.h>
# include <sys/time.h>
diff --git a/sys/dev/pci/if_san_obsd.c b/sys/dev/pci/if_san_obsd.c
index 70810a7559f..3be231b2696 100644
--- a/sys/dev/pci/if_san_obsd.c
+++ b/sys/dev/pci/if_san_obsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_san_obsd.c,v 1.15 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: if_san_obsd.c,v 1.16 2014/09/14 14:17:25 jsg Exp $ */
/*-
* Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -35,7 +35,6 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/syslog.h>
#include <sys/ioccom.h>
#include <sys/conf.h>
diff --git a/sys/dev/pci/if_san_xilinx.c b/sys/dev/pci/if_san_xilinx.c
index 06ab0b98098..96b75705ef8 100644
--- a/sys/dev/pci/if_san_xilinx.c
+++ b/sys/dev/pci/if_san_xilinx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_san_xilinx.c,v 1.30 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: if_san_xilinx.c,v 1.31 2014/09/14 14:17:25 jsg Exp $ */
/*-
* Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -41,7 +41,6 @@
#include <sys/malloc.h>
#include <sys/errno.h>
#include <sys/mbuf.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/kernel.h>
#include <sys/time.h>
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index de2f9602e46..ca6eaa22dba 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci.c,v 1.104 2014/09/13 16:06:37 doug Exp $ */
+/* $OpenBSD: pci.c,v 1.105 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */
/*
@@ -39,7 +39,6 @@
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 13c07bd4f98..680b83583b5 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_pcmcia.c,v 1.53 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: com_pcmcia.c,v 1.54 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */
/*
@@ -93,7 +93,6 @@
#include <sys/ioctl.h>
#include <sys/selinfo.h>
#include <sys/tty.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c
index cc6f945ef52..b41c8255765 100644
--- a/sys/dev/pcmcia/if_malo.c
+++ b/sys/dev/pcmcia/if_malo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_malo.c,v 1.79 2014/08/11 12:45:45 mpi Exp $ */
+/* $OpenBSD: if_malo.c,v 1.80 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -19,7 +19,6 @@
#include "bpfilter.h"
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index fdd04a9e1ee..69bcad8d6e1 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_pcmcia.c,v 1.30 2014/07/10 14:21:20 deraadt Exp $ */
+/* $OpenBSD: wdc_pcmcia.c,v 1.31 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */
/*-
@@ -44,7 +44,6 @@
#include <sys/disklabel.h>
#include <sys/disk.h>
#include <sys/syslog.h>
-#include <sys/proc.h>
#include <machine/cpu.h>
#include <machine/intr.h>
diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c
index deccbed4c97..c390a9e1f8b 100644
--- a/sys/dev/puc/com_puc.c
+++ b/sys/dev/puc/com_puc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_puc.c,v 1.21 2013/12/09 19:52:01 deraadt Exp $ */
+/* $OpenBSD: com_puc.c,v 1.22 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 1997 - 1999, Jason Downs. All rights reserved.
@@ -33,7 +33,6 @@
#include <sys/ioctl.h>
#include <sys/selinfo.h>
#include <sys/tty.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
diff --git a/sys/dev/radio.c b/sys/dev/radio.c
index eb381706485..b0dd3c4b344 100644
--- a/sys/dev/radio.c
+++ b/sys/dev/radio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radio.c,v 1.9 2011/07/03 15:47:16 matthew Exp $ */
+/* $OpenBSD: radio.c,v 1.10 2014/09/14 14:17:24 jsg Exp $ */
/* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
/*
@@ -30,7 +30,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/fcntl.h>
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c
index ec14e473002..52a689c41b7 100644
--- a/sys/dev/sdmmc/sdmmc.c
+++ b/sys/dev/sdmmc/sdmmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc.c,v 1.34 2014/07/12 18:48:52 tedu Exp $ */
+/* $OpenBSD: sdmmc.c,v 1.35 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -27,7 +27,6 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/systm.h>
diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c
index 4f8244d5fd3..86d14205dfa 100644
--- a/sys/dev/sdmmc/sdmmc_io.c
+++ b/sys/dev/sdmmc/sdmmc_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_io.c,v 1.20 2014/07/12 18:48:52 tedu Exp $ */
+/* $OpenBSD: sdmmc_io.c,v 1.21 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -22,7 +22,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <dev/sdmmc/sdmmc_ioreg.h>
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index 1332a7f3d79..d7a1424c93d 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_scsi.c,v 1.31 2014/07/12 18:48:52 tedu Exp $ */
+/* $OpenBSD: sdmmc_scsi.c,v 1.32 2014/09/14 14:17:25 jsg Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -23,7 +23,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <scsi/scsi_all.h>
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index a187da04ce1..6123598007c 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.339 2014/09/13 16:06:37 doug Exp $ */
+/* $OpenBSD: softraid.c,v 1.340 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/kernel.h>
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c
index 40160fd6bc1..7ddaf0043b2 100644
--- a/sys/dev/softraid_crypto.c
+++ b/sys/dev/softraid_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_crypto.c,v 1.111 2014/09/13 16:06:37 doug Exp $ */
+/* $OpenBSD: softraid_crypto.c,v 1.112 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org>
@@ -25,7 +25,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/kernel.h>
diff --git a/sys/dev/softraid_raid0.c b/sys/dev/softraid_raid0.c
index 913aeba2e08..532fb492549 100644
--- a/sys/dev/softraid_raid0.c
+++ b/sys/dev/softraid_raid0.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid0.c,v 1.45 2013/11/21 16:54:46 krw Exp $ */
+/* $OpenBSD: softraid_raid0.c,v 1.46 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2008 Marco Peereboom <marco@peereboom.us>
*
@@ -22,7 +22,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/disk.h>
diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c
index 28e06b20b5f..c22871c3ee5 100644
--- a/sys/dev/softraid_raid1.c
+++ b/sys/dev/softraid_raid1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid1.c,v 1.57 2014/07/12 07:39:12 blambert Exp $ */
+/* $OpenBSD: softraid_raid1.c,v 1.58 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
*
@@ -22,7 +22,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/disk.h>
diff --git a/sys/dev/softraid_raid5.c b/sys/dev/softraid_raid5.c
index b4328f69735..ce1d19f2f48 100644
--- a/sys/dev/softraid_raid5.c
+++ b/sys/dev/softraid_raid5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid5.c,v 1.15 2014/01/23 00:22:35 jsing Exp $ */
+/* $OpenBSD: softraid_raid5.c,v 1.16 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
@@ -24,7 +24,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/disk.h>
diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c
index b188164b015..2425281ae89 100644
--- a/sys/dev/softraid_raid6.c
+++ b/sys/dev/softraid_raid6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid6.c,v 1.62 2014/07/12 18:48:51 tedu Exp $ */
+/* $OpenBSD: softraid_raid6.c,v 1.63 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -23,7 +23,6 @@
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/disk.h>
diff --git a/sys/dev/video.c b/sys/dev/video.c
index 0363039a488..8e3a291f186 100644
--- a/sys/dev/video.c
+++ b/sys/dev/video.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: video.c,v 1.31 2014/07/12 18:48:51 tedu Exp $ */
+/* $OpenBSD: video.c,v 1.32 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -19,7 +19,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/fcntl.h>
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c
index 5f22a71886c..dd5b911b906 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vscsi.c,v 1.30 2014/07/12 18:48:51 tedu Exp $ */
+/* $OpenBSD: vscsi.c,v 1.31 2014/09/14 14:17:24 jsg Exp $ */
/*
* Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -22,7 +22,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/queue.h>
#include <sys/rwlock.h>
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 87b2378b648..7baab7fa522 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.119 2014/07/12 18:48:53 tedu Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.120 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
/*
@@ -36,7 +36,6 @@
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 9fd74cce859..6dda88f06e6 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsevent.c,v 1.9 2014/07/12 18:48:53 tedu Exp $ */
+/* $OpenBSD: wsevent.c,v 1.10 2014/09/14 14:17:25 jsg Exp $ */
/* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
/*
@@ -78,7 +78,6 @@
#include <sys/param.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/vnode.h>
#include <sys/selinfo.h>