summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-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.c4
-rw-r--r--sys/dev/ic/adv.c3
-rw-r--r--sys/dev/ic/aic6360.c3
-rw-r--r--sys/dev/ic/bha.c3
-rw-r--r--sys/dev/ic/com.c3
-rw-r--r--sys/dev/ic/cy.c3
-rw-r--r--sys/dev/ic/isp_openbsd.h3
-rw-r--r--sys/dev/ic/lpt.c3
-rw-r--r--sys/dev/ic/ncr5380sbc.c3
-rw-r--r--sys/dev/ic/ncr53c9x.c3
-rw-r--r--sys/dev/ic/uha.c4
-rw-r--r--sys/dev/isa/aha.c3
-rw-r--r--sys/dev/isa/aic_isa.c3
-rw-r--r--sys/dev/isa/seagate.c3
-rw-r--r--sys/dev/isa/uha_isa.c4
-rw-r--r--sys/dev/isa/wds.c4
-rw-r--r--sys/dev/microcode/adw/adwmcode.c3
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c3
-rw-r--r--sys/dev/puc/com_puc.c3
-rw-r--r--sys/dev/raidframe/rf_openbsdkintf.c3
23 files changed, 27 insertions, 46 deletions
diff --git a/sys/dev/cninit.c b/sys/dev/cninit.c
index e4989f1c7df..f991fb43d19 100644
--- a/sys/dev/cninit.c
+++ b/sys/dev/cninit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cninit.c,v 1.9 2010/06/09 15:44:17 miod Exp $ */
+/* $OpenBSD: cninit.c,v 1.10 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: cninit.c,v 1.2 1995/04/11 22:08:10 pk Exp $ */
/*
@@ -42,7 +42,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/user.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 8b567a62362..b64fe2d72d5 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.c,v 1.19 2010/06/09 15:44:17 miod Exp $ */
+/* $OpenBSD: cons.c,v 1.20 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: cons.c,v 1.30 1996/04/08 19:57:30 jonathan Exp $ */
/*
@@ -42,7 +42,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/user.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 51c00d19d14..c4be3d021d4 100644
--- a/sys/dev/eisa/aha1742.c
+++ b/sys/dev/eisa/aha1742.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha1742.c,v 1.39 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: aha1742.c,v 1.40 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */
/*
@@ -57,7 +57,6 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.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 eea7ba32fd6..91e12a07c5e 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.10 2009/08/29 13:58:51 jasper Exp $ */
+/* $OpenBSD: uha_eisa.c,v 1.11 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $ */
/*
@@ -36,7 +36,7 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/user.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index bebe8de45c5..5f54e023499 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv.c,v 1.30 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: adv.c,v 1.31 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index e153117cad0..148f8b25406 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic6360.c,v 1.23 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: aic6360.c,v 1.24 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
#ifdef DDB
@@ -131,7 +131,6 @@
#include <sys/device.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index cf7e2f58cb1..27efefda195 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bha.c,v 1.23 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: bha.c,v 1.24 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */
#undef BHADEBUG
@@ -63,7 +63,6 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index ab41d22e286..1f5f6f3156a 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com.c,v 1.138 2010/04/12 12:57:52 tedu Exp $ */
+/* $OpenBSD: com.c,v 1.139 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -68,7 +68,6 @@
#include <sys/selinfo.h>
#include <sys/tty.h>
#include <sys/proc.h>
-#include <sys/user.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 e076b8f2dfc..5f6fddbba4f 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cy.c,v 1.29 2010/04/12 12:57:52 tedu Exp $ */
+/* $OpenBSD: cy.c,v 1.30 2010/06/26 23:24:44 guenther Exp $ */
/*
* Copyright (c) 1996 Timo Rossi.
* All rights reserved.
@@ -62,7 +62,6 @@
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/conf.h>
-#include <sys/user.h>
#include <sys/selinfo.h>
#include <sys/device.h>
#include <sys/malloc.h>
diff --git a/sys/dev/ic/isp_openbsd.h b/sys/dev/ic/isp_openbsd.h
index b105de0f280..268c5e36015 100644
--- a/sys/dev/ic/isp_openbsd.h
+++ b/sys/dev/ic/isp_openbsd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_openbsd.h,v 1.32 2009/07/01 20:55:57 kettenis Exp $ */
+/* $OpenBSD: isp_openbsd.h,v 1.33 2010/06/26 23:24:44 guenther Exp $ */
/*
* OpenBSD Specific definitions for the QLogic ISP Host Adapter
*/
@@ -38,7 +38,6 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/queue.h>
#if !(defined(__sparc__) && !defined(__sparcv9__))
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index 692682557ee..9f7ba6cb891 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpt.c,v 1.5 2002/03/14 01:26:54 millert Exp $ */
+/* $OpenBSD: lpt.c,v 1.6 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: lpt.c,v 1.42 1996/10/21 22:41:14 thorpej Exp $ */
/*
@@ -57,7 +57,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/buf.h>
#include <sys/kernel.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index dafbdedf0ff..670feb2f1c9 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr5380sbc.c,v 1.25 2010/03/25 13:18:03 otto Exp $ */
+/* $OpenBSD: ncr5380sbc.c,v 1.26 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $ */
/*
@@ -75,7 +75,6 @@
#include <sys/device.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <scsi/scsi_all.h>
#include <scsi/scsi_debug.h>
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 70745a89fc2..1ac3d435d06 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr53c9x.c,v 1.46 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: ncr53c9x.c,v 1.47 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */
/*
@@ -75,7 +75,6 @@
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/queue.h>
#include <sys/pool.h>
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index bf2a270c36b..2f68bedbabe 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha.c,v 1.17 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: uha.c,v 1.18 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@@ -69,7 +69,7 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 6fefc155bfa..1ba599c9959 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha.c,v 1.69 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: aha.c,v 1.70 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */
#undef AHADIAG
@@ -57,7 +57,6 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/timeout.h>
#include <uvm/uvm.h>
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index cf81728a085..04b0797c562 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.5 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: aic_isa.c,v 1.6 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
/*
@@ -60,7 +60,6 @@
#include <sys/device.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 48b0fbf7205..2caee4c46a9 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: seagate.c,v 1.34 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: seagate.c,v 1.35 2010/06/26 23:24:44 guenther Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -73,7 +73,6 @@
#include <sys/device.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/queue.h>
#include <sys/malloc.h>
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c
index 7bb7074f0d7..8dd1c1e14ac 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.10 2009/08/26 22:29:09 jasper Exp $ */
+/* $OpenBSD: uha_isa.c,v 1.11 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: uha_isa.c,v 1.5 1996/10/21 22:41:21 thorpej Exp $ */
/*
@@ -36,7 +36,7 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/user.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index d9008aba071..1e4e6c7f554 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.34 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: wds.c,v 1.35 2010/06/26 23:24:44 guenther Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -67,7 +67,7 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/microcode/adw/adwmcode.c b/sys/dev/microcode/adw/adwmcode.c
index 6047964a198..41818b8ff59 100644
--- a/sys/dev/microcode/adw/adwmcode.c
+++ b/sys/dev/microcode/adw/adwmcode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adwmcode.c,v 1.3 2008/06/26 05:42:16 ray Exp $ */
+/* $OpenBSD: adwmcode.c,v 1.4 2010/06/26 23:24:45 guenther Exp $ */
/* $NetBSD: adwmcode.c,v 1.5 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -58,7 +58,6 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 4f60c05b483..58ebfb4556f 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.49 2009/10/13 19:33:16 pirofti Exp $ */
+/* $OpenBSD: com_pcmcia.c,v 1.50 2010/06/26 23:24:45 guenther Exp $ */
/* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */
/*
@@ -94,7 +94,6 @@
#include <sys/selinfo.h>
#include <sys/tty.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c
index 8a11804423c..84ba7d16c98 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.16 2008/05/21 18:49:47 kettenis Exp $ */
+/* $OpenBSD: com_puc.c,v 1.17 2010/06/26 23:24:45 guenther Exp $ */
/*
* Copyright (c) 1997 - 1999, Jason Downs. All rights reserved.
@@ -34,7 +34,6 @@
#include <sys/selinfo.h>
#include <sys/tty.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c
index 193915b404e..69bba6d32a5 100644
--- a/sys/dev/raidframe/rf_openbsdkintf.c
+++ b/sys/dev/raidframe/rf_openbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_openbsdkintf.c,v 1.56 2010/05/23 13:49:35 naddy Exp $ */
+/* $OpenBSD: rf_openbsdkintf.c,v 1.57 2010/06/26 23:24:45 guenther Exp $ */
/* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */
/*-
@@ -119,7 +119,6 @@
#include <sys/lock.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/user.h>
#include <sys/reboot.h>
#include "raid.h"