diff options
Diffstat (limited to 'sys')
115 files changed, 137 insertions, 231 deletions
diff --git a/sys/arch/alpha/alpha/promcons.c b/sys/arch/alpha/alpha/promcons.c index 5df9fef0afa..e2396acbb03 100644 --- a/sys/arch/alpha/alpha/promcons.c +++ b/sys/arch/alpha/alpha/promcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promcons.c,v 1.13 2010/04/12 12:57:51 tedu Exp $ */ +/* $OpenBSD: promcons.c,v 1.14 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: promcons.c,v 1.5 1996/11/13 22:20:55 cgd Exp $ */ /* @@ -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/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c index 9de04e5814b..40da9cf7743 100644 --- a/sys/arch/amd64/amd64/cpu.c +++ b/sys/arch/amd64/amd64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.33 2010/05/08 16:54:07 oga Exp $ */ +/* $OpenBSD: cpu.c,v 1.34 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */ /*- @@ -69,7 +69,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/device.h> #include <sys/malloc.h> diff --git a/sys/arch/amd64/amd64/gdt.c b/sys/arch/amd64/amd64/gdt.c index 9faec1b13f5..8e196e37b10 100644 --- a/sys/arch/amd64/amd64/gdt.c +++ b/sys/arch/amd64/amd64/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.15 2009/09/18 21:08:19 martynas Exp $ */ +/* $OpenBSD: gdt.c,v 1.16 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: gdt.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /*- @@ -40,12 +40,12 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/mutex.h> #include <uvm/uvm.h> #include <machine/gdt.h> +#include <machine/pcb.h> int gdt_next; /* next available slot for sweeping */ int gdt_free; /* next free slot; terminated with GNULL_SEL */ diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c index 05f04c3ba86..cd6189bde29 100644 --- a/sys/arch/amd64/amd64/identcpu.c +++ b/sys/arch/amd64/amd64/identcpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identcpu.c,v 1.27 2010/03/21 23:00:57 jsg Exp $ */ +/* $OpenBSD: identcpu.c,v 1.28 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/sysctl.h> #include <machine/cpu.h> #include <machine/cpufunc.h> diff --git a/sys/arch/amd64/amd64/lapic.c b/sys/arch/amd64/amd64/lapic.c index 2dbd9acb983..60d4febbd15 100644 --- a/sys/arch/amd64/amd64/lapic.c +++ b/sys/arch/amd64/amd64/lapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lapic.c,v 1.23 2010/04/01 19:47:59 kettenis Exp $ */ +/* $OpenBSD: lapic.c,v 1.24 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: lapic.c,v 1.2 2003/05/08 01:04:35 fvdl Exp $ */ /*- @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/amd64/amd64/syscall.c b/sys/arch/amd64/amd64/syscall.c index 72eb9a22fcc..928dabb0d7d 100644 --- a/sys/arch/amd64/amd64/syscall.c +++ b/sys/arch/amd64/amd64/syscall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.c,v 1.14 2010/05/06 21:33:51 nicm Exp $ */ +/* $OpenBSD: syscall.c,v 1.15 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: syscall.c,v 1.1 2003/04/26 18:39:32 fvdl Exp $ */ /*- @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/signal.h> #ifdef KTRACE #include <sys/ktrace.h> diff --git a/sys/arch/amd64/amd64/via.c b/sys/arch/amd64/amd64/via.c index 4ae4094d874..00a63267aea 100644 --- a/sys/arch/amd64/amd64/via.c +++ b/sys/arch/amd64/amd64/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.3 2010/06/08 07:36:36 thib Exp $ */ +/* $OpenBSD: via.c,v 1.4 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -24,7 +24,6 @@ #include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/exec.h> #include <sys/buf.h> #include <sys/reboot.h> diff --git a/sys/arch/aviion/aviion/bus_dma.c b/sys/arch/aviion/aviion/bus_dma.c index 81ab9fa1325..90a967aac8c 100644 --- a/sys/arch/aviion/aviion/bus_dma.c +++ b/sys/arch/aviion/aviion/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.1 2010/04/20 22:53:20 miod Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.2 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */ /*- @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/extent.h> #include <sys/buf.h> #include <sys/device.h> diff --git a/sys/arch/hp300/dev/mb89352.c b/sys/arch/hp300/dev/mb89352.c index 065c2f585cb..f738d175373 100644 --- a/sys/arch/hp300/dev/mb89352.c +++ b/sys/arch/hp300/dev/mb89352.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mb89352.c,v 1.23 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: mb89352.c,v 1.24 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */ /* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */ @@ -119,7 +119,6 @@ #include <sys/device.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/queue.h> #include <machine/intr.h> diff --git a/sys/arch/hppa64/dev/pdc.c b/sys/arch/hppa64/dev/pdc.c index 362ae32f6a3..df735089543 100644 --- a/sys/arch/hppa64/dev/pdc.c +++ b/sys/arch/hppa64/dev/pdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdc.c,v 1.7 2010/04/12 12:57:52 tedu Exp $ */ +/* $OpenBSD: pdc.c,v 1.8 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -23,7 +23,6 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/tty.h> -#include <sys/user.h> #include <sys/timeout.h> #include <dev/cons.h> diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c index b2ce1ab4dfe..5203799650d 100644 --- a/sys/arch/i386/i386/apm.c +++ b/sys/arch/i386/i386/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.85 2010/03/30 17:40:55 oga Exp $ */ +/* $OpenBSD: apm.c,v 1.86 2010/06/26 23:24:43 guenther Exp $ */ /*- * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved. @@ -43,7 +43,7 @@ #include <sys/kthread.h> #include <sys/rwlock.h> #include <sys/proc.h> -#include <sys/user.h> +#include <sys/sysctl.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/fcntl.h> diff --git a/sys/arch/i386/i386/cpu.c b/sys/arch/i386/i386/cpu.c index 41af715a159..751e2d05875 100644 --- a/sys/arch/i386/i386/cpu.c +++ b/sys/arch/i386/i386/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.39 2010/05/08 16:54:07 oga Exp $ */ +/* $OpenBSD: cpu.c,v 1.40 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */ /*- @@ -69,7 +69,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c index eaab6cb7aeb..e7c99f9d591 100644 --- a/sys/arch/i386/i386/gdt.c +++ b/sys/arch/i386/i386/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.29 2009/02/03 11:24:19 mikeb Exp $ */ +/* $OpenBSD: gdt.c,v 1.30 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: gdt.c,v 1.28 2002/12/14 09:38:50 junyoung Exp $ */ /*- @@ -53,12 +53,12 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/lock.h> -#include <sys/user.h> #include <sys/mutex.h> #include <uvm/uvm.h> #include <machine/gdt.h> +#include <machine/pcb.h> union descriptor bootstrap_gdt[NGDT]; union descriptor *gdt = bootstrap_gdt; diff --git a/sys/arch/i386/i386/lapic.c b/sys/arch/i386/i386/lapic.c index 11760a497d0..423f58fea78 100644 --- a/sys/arch/i386/i386/lapic.c +++ b/sys/arch/i386/i386/lapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lapic.c,v 1.27 2010/04/01 19:48:50 kettenis Exp $ */ +/* $OpenBSD: lapic.c,v 1.28 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */ /*- @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/i386/i386/via.c b/sys/arch/i386/i386/via.c index e904906052e..da7206bbf10 100644 --- a/sys/arch/i386/i386/via.c +++ b/sys/arch/i386/i386/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.21 2010/06/08 07:36:36 thib Exp $ */ +/* $OpenBSD: via.c,v 1.22 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -24,7 +24,6 @@ #include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/exec.h> #include <sys/buf.h> #include <sys/reboot.h> diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c index 3d70760a5ce..fb083fc9b62 100644 --- a/sys/arch/landisk/landisk/machdep.c +++ b/sys/arch/landisk/landisk/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.20 2010/06/10 17:54:13 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.21 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -71,7 +71,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/mount.h> #include <sys/reboot.h> #include <sys/sysctl.h> @@ -93,6 +92,7 @@ #include <machine/cpu.h> #include <machine/kcore.h> +#include <machine/pcb.h> #include <landisk/landisk/landiskreg.h> diff --git a/sys/arch/loongson/loongson/bus_dma.c b/sys/arch/loongson/loongson/bus_dma.c index 2f74ddd6252..fb729c55286 100644 --- a/sys/arch/loongson/loongson/bus_dma.c +++ b/sys/arch/loongson/loongson/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.4 2010/03/29 19:21:58 oga Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.5 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -60,7 +60,6 @@ #include <sys/proc.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/user.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c index c3681d2a674..49a7a98b9ba 100644 --- a/sys/arch/luna88k/dev/mb89352.c +++ b/sys/arch/luna88k/dev/mb89352.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mb89352.c,v 1.13 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: mb89352.c,v 1.14 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */ /* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */ @@ -127,7 +127,6 @@ #include <sys/device.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/queue.h> #include <machine/intr.h> diff --git a/sys/arch/luna88k/dev/siotty.c b/sys/arch/luna88k/dev/siotty.c index 15f7185fdb6..695d452704e 100644 --- a/sys/arch/luna88k/dev/siotty.c +++ b/sys/arch/luna88k/dev/siotty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siotty.c,v 1.11 2010/04/12 12:57:52 tedu Exp $ */ +/* $OpenBSD: siotty.c,v 1.12 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: siotty.c,v 1.9 2002/03/17 19:40:43 atatat Exp $ */ /*- @@ -36,7 +36,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/fcntl.h> diff --git a/sys/arch/m68k/m68k/pmap_motorola.c b/sys/arch/m68k/m68k/pmap_motorola.c index 207d584ebbc..781001f50f1 100644 --- a/sys/arch/m68k/m68k/pmap_motorola.c +++ b/sys/arch/m68k/m68k/pmap_motorola.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_motorola.c,v 1.56 2010/05/13 20:37:00 miod Exp $ */ +/* $OpenBSD: pmap_motorola.c,v 1.57 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -149,7 +149,6 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/malloc.h> -#include <sys/user.h> #include <sys/pool.h> #include <machine/pte.h> diff --git a/sys/arch/m68k/m68k/sig_machdep.c b/sys/arch/m68k/m68k/sig_machdep.c index ae07a5d9d3c..bdac27baa53 100644 --- a/sys/arch/m68k/m68k/sig_machdep.c +++ b/sys/arch/m68k/m68k/sig_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig_machdep.c,v 1.20 2009/03/25 22:42:58 weingart Exp $ */ +/* $OpenBSD: sig_machdep.c,v 1.21 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: sig_machdep.c,v 1.3 1997/04/30 23:28:03 gwr Exp $ */ /* @@ -65,7 +65,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/exec.h> #include <sys/ioctl.h> #include <sys/mount.h> diff --git a/sys/arch/m68k/m68k/sunos_machdep.c b/sys/arch/m68k/m68k/sunos_machdep.c index 43efc4be400..02de1aa6f17 100644 --- a/sys/arch/m68k/m68k/sunos_machdep.c +++ b/sys/arch/m68k/m68k/sunos_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunos_machdep.c,v 1.19 2007/11/02 19:18:54 martin Exp $ */ +/* $OpenBSD: sunos_machdep.c,v 1.20 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: sunos_machdep.c,v 1.12 1996/10/13 03:19:22 christos Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/filedesc.h> #include <sys/ioctl.h> #include <sys/mount.h> @@ -53,6 +52,8 @@ #include <sys/malloc.h> #include <sys/buf.h> +#include <uvm/uvm_extern.h> + #include <sys/syscallargs.h> #include <compat/sunos/sunos.h> #include <compat/sunos/sunos_syscallargs.h> diff --git a/sys/arch/m88k/m88k/m88110_fp.c b/sys/arch/m88k/m88k/m88110_fp.c index ac0d80b3fab..98daa76b9c7 100644 --- a/sys/arch/m88k/m88k/m88110_fp.c +++ b/sys/arch/m88k/m88k/m88110_fp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m88110_fp.c,v 1.2 2008/05/02 21:45:14 miod Exp $ */ +/* $OpenBSD: m88110_fp.c,v 1.3 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 2007, Miodrag Vallat. @@ -21,7 +21,6 @@ #include <sys/param.h> #include <sys/proc.h> #include <sys/signalvar.h> -#include <sys/user.h> #include <sys/systm.h> #include <machine/fpu.h> diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c index 5a8d72ba87d..87a5396596f 100644 --- a/sys/arch/m88k/m88k/pmap.c +++ b/sys/arch/m88k/m88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.51 2010/05/09 15:46:17 jasper Exp $ */ +/* $OpenBSD: pmap.c,v 1.52 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 2001-2004, Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -51,7 +51,6 @@ #include <sys/malloc.h> #include <sys/pool.h> #include <sys/msgbuf.h> -#include <sys/user.h> #include <machine/asm_macro.h> #include <machine/cmmu.h> diff --git a/sys/arch/m88k/m88k/sig_machdep.c b/sys/arch/m88k/m88k/sig_machdep.c index 299bc758805..8557ec29145 100644 --- a/sys/arch/m88k/m88k/sig_machdep.c +++ b/sys/arch/m88k/m88k/sig_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig_machdep.c,v 1.9 2008/07/28 17:50:11 miod Exp $ */ +/* $OpenBSD: sig_machdep.c,v 1.10 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -49,7 +49,6 @@ #include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/mount.h> #include <sys/syscallargs.h> #include <sys/errno.h> diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c index d61ddcc6cea..124d747e900 100644 --- a/sys/arch/mac68k/dev/esp.c +++ b/sys/arch/mac68k/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.28 2009/02/16 21:19:05 miod Exp $ */ +/* $OpenBSD: esp.c,v 1.29 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: esp.c,v 1.17 1998/09/05 15:15:35 pk Exp $ */ /* @@ -81,7 +81,6 @@ #include <sys/device.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/queue.h> #include <scsi/scsi_all.h> diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c index 097843034b1..93ded6121c7 100644 --- a/sys/arch/mac68k/dev/sbc.c +++ b/sys/arch/mac68k/dev/sbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc.c,v 1.18 2009/02/16 21:19:05 miod Exp $ */ +/* $OpenBSD: sbc.c,v 1.19 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: sbc.c,v 1.24 1997/04/18 17:38:08 scottr Exp $ */ /* @@ -57,7 +57,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/arch/mac68k/dev/sbc_obio.c b/sys/arch/mac68k/dev/sbc_obio.c index 7c4d00e9c0a..34c1b494557 100644 --- a/sys/arch/mac68k/dev/sbc_obio.c +++ b/sys/arch/mac68k/dev/sbc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc_obio.c,v 1.15 2006/12/13 21:12:56 miod Exp $ */ +/* $OpenBSD: sbc_obio.c,v 1.16 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: sbc_obio.c,v 1.1 1997/03/01 20:18:59 scottr Exp $ */ /* @@ -39,7 +39,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/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c index f236f7d2790..79f02644acd 100644 --- a/sys/arch/macppc/dev/esp.c +++ b/sys/arch/macppc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.5 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: esp.c,v 1.6 2010/06/26 23:24:43 guenther Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -80,7 +80,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/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c index 2f76590892d..0a3c043bdbc 100644 --- a/sys/arch/macppc/macppc/cpu.c +++ b/sys/arch/macppc/macppc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.65 2010/03/31 19:46:27 miod Exp $ */ +/* $OpenBSD: cpu.c,v 1.66 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -36,9 +36,11 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> +#include <sys/sysctl.h> #include <sys/device.h> +#include <uvm/uvm_extern.h> + #include <dev/ofw/openfirm.h> #include <machine/autoconf.h> diff --git a/sys/arch/macppc/macppc/dma.c b/sys/arch/macppc/macppc/dma.c index 2b616bfcd5e..2e064c35fef 100644 --- a/sys/arch/macppc/macppc/dma.c +++ b/sys/arch/macppc/macppc/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.32 2010/03/29 19:21:58 oga Exp $ */ +/* $OpenBSD: dma.c,v 1.33 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/extent.h> #include <sys/buf.h> #include <sys/device.h> diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c index 29425f944c7..5d1c8862b4f 100644 --- a/sys/arch/mips64/mips64/cpu.c +++ b/sys/arch/mips64/mips64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.29 2010/04/28 16:20:28 syuu Exp $ */ +/* $OpenBSD: cpu.c,v 1.30 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se) @@ -29,10 +29,11 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/device.h> #include <sys/malloc.h> +#include <uvm/uvm_extern.h> + #include <machine/cpu.h> #include <machine/autoconf.h> diff --git a/sys/arch/mips64/mips64/mem.c b/sys/arch/mips64/mips64/mem.c index 84850c602d4..cbb567c5bfc 100644 --- a/sys/arch/mips64/mips64/mem.c +++ b/sys/arch/mips64/mips64/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.15 2010/01/22 21:45:25 miod Exp $ */ +/* $OpenBSD: mem.c,v 1.16 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: mem.c,v 1.6 1995/04/10 11:55:03 mycroft Exp $ */ /* @@ -49,7 +49,6 @@ #include <sys/conf.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/msgbuf.h> #include <sys/systm.h> #include <sys/uio.h> diff --git a/sys/arch/mips64/mips64/process_machdep.c b/sys/arch/mips64/mips64/process_machdep.c index fbbbeec1222..bfe1b2948b3 100644 --- a/sys/arch/mips64/mips64/process_machdep.c +++ b/sys/arch/mips64/mips64/process_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process_machdep.c,v 1.13 2010/01/08 01:35:52 syuu Exp $ */ +/* $OpenBSD: process_machdep.c,v 1.14 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1994 Adam Glass @@ -40,7 +40,7 @@ * From: * Id: procfs_i386.c,v 4.1 1993/12/17 10:47:45 jsp Rel * - * $Id: process_machdep.c,v 1.13 2010/01/08 01:35:52 syuu Exp $ + * $Id: process_machdep.c,v 1.14 2010/06/26 23:24:43 guenther Exp $ */ /* @@ -70,7 +70,6 @@ #include <sys/time.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/vnode.h> #include <sys/ptrace.h> #include <machine/frame.h> diff --git a/sys/arch/mips64/mips64/sendsig.c b/sys/arch/mips64/mips64/sendsig.c index 9773c39eb42..0ad5276b1c8 100644 --- a/sys/arch/mips64/mips64/sendsig.c +++ b/sys/arch/mips64/mips64/sendsig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sendsig.c,v 1.12 2010/04/21 03:03:26 deraadt Exp $ */ +/* $OpenBSD: sendsig.c,v 1.13 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -66,11 +66,12 @@ #include <sys/systm.h> #include <sys/signalvar.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/exec.h> #include <sys/mount.h> #include <sys/syscallargs.h> +#include <uvm/uvm_extern.h> + #include <machine/regnum.h> /* diff --git a/sys/arch/mvme68k/dev/flash.c b/sys/arch/mvme68k/dev/flash.c index c07428b90a1..c4dd031fdcd 100644 --- a/sys/arch/mvme68k/dev/flash.c +++ b/sys/arch/mvme68k/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.19 2009/03/01 21:37:41 miod Exp $ */ +/* $OpenBSD: flash.c,v 1.20 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/fooip.c b/sys/arch/mvme68k/dev/fooip.c index 6b05f709976..abfb9b8e189 100644 --- a/sys/arch/mvme68k/dev/fooip.c +++ b/sys/arch/mvme68k/dev/fooip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fooip.c,v 1.9 2004/07/30 22:29:44 miod Exp $ */ +/* $OpenBSD: fooip.c,v 1.10 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -32,7 +32,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/ipic.c b/sys/arch/mvme68k/dev/ipic.c index e007ca92c84..f82c264985c 100644 --- a/sys/arch/mvme68k/dev/ipic.c +++ b/sys/arch/mvme68k/dev/ipic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipic.c,v 1.17 2005/11/27 14:19:08 miod Exp $ */ +/* $OpenBSD: ipic.c,v 1.18 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -29,7 +29,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/lp.c b/sys/arch/mvme68k/dev/lp.c index 73a97b612ef..986c1c46fd7 100644 --- a/sys/arch/mvme68k/dev/lp.c +++ b/sys/arch/mvme68k/dev/lp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lp.c,v 1.10 2004/07/30 22:29:45 miod Exp $ */ +/* $OpenBSD: lp.c,v 1.11 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/mc.c b/sys/arch/mvme68k/dev/mc.c index 700a4fd8248..10b91981ec0 100644 --- a/sys/arch/mvme68k/dev/mc.c +++ b/sys/arch/mvme68k/dev/mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mc.c,v 1.18 2009/02/17 22:28:40 miod Exp $ */ +/* $OpenBSD: mc.c,v 1.19 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -32,7 +32,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/memc.c b/sys/arch/mvme68k/dev/memc.c index 9dd36658381..f1914a26441 100644 --- a/sys/arch/mvme68k/dev/memc.c +++ b/sys/arch/mvme68k/dev/memc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memc.c,v 1.10 2004/07/30 22:29:45 miod Exp $ */ +/* $OpenBSD: memc.c,v 1.11 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -34,7 +34,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/pcc.c b/sys/arch/mvme68k/dev/pcc.c index 5158ec5f051..85c502b6409 100644 --- a/sys/arch/mvme68k/dev/pcc.c +++ b/sys/arch/mvme68k/dev/pcc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcc.c,v 1.17 2009/03/01 22:07:12 miod Exp $ */ +/* $OpenBSD: pcc.c,v 1.18 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -32,7 +32,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/pcctwo.c b/sys/arch/mvme68k/dev/pcctwo.c index f3bbc2b4a41..5aba774b126 100644 --- a/sys/arch/mvme68k/dev/pcctwo.c +++ b/sys/arch/mvme68k/dev/pcctwo.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pcctwo.c,v 1.17 2009/03/01 21:37:41 miod Exp $ */ +/* $OpenBSD: pcctwo.c,v 1.18 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -33,7 +33,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/vme.c b/sys/arch/mvme68k/dev/vme.c index 92c6a3f175e..c40cc9b0b24 100644 --- a/sys/arch/mvme68k/dev/vme.c +++ b/sys/arch/mvme68k/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.27 2009/03/01 22:08:13 miod Exp $ */ +/* $OpenBSD: vme.c,v 1.28 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -30,7 +30,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/dev/vmel.c b/sys/arch/mvme68k/dev/vmel.c index a16bf0824b3..98f4f6bdcfb 100644 --- a/sys/arch/mvme68k/dev/vmel.c +++ b/sys/arch/mvme68k/dev/vmel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmel.c,v 1.14 2005/11/24 22:43:16 miod Exp $ */ +/* $OpenBSD: vmel.c,v 1.15 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -27,7 +27,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/device.h> diff --git a/sys/arch/mvme68k/dev/vmes.c b/sys/arch/mvme68k/dev/vmes.c index 7c903ad19e2..f5e4002c025 100644 --- a/sys/arch/mvme68k/dev/vmes.c +++ b/sys/arch/mvme68k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.14 2005/11/24 22:43:16 miod Exp $ */ +/* $OpenBSD: vmes.c,v 1.15 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -27,7 +27,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/device.h> diff --git a/sys/arch/mvme68k/dev/zs.c b/sys/arch/mvme68k/dev/zs.c index 9c23b1b634c..6896a0462b4 100644 --- a/sys/arch/mvme68k/dev/zs.c +++ b/sys/arch/mvme68k/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.31 2010/04/12 12:57:52 tedu Exp $ */ +/* $OpenBSD: zs.c,v 1.32 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 2000 Steve Murphree, Jr. @@ -32,7 +32,6 @@ #include <sys/param.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme68k/mvme68k/bus_dma.c b/sys/arch/mvme68k/mvme68k/bus_dma.c index 7918fe16ede..ce6662712bb 100644 --- a/sys/arch/mvme68k/mvme68k/bus_dma.c +++ b/sys/arch/mvme68k/mvme68k/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.6 2010/03/29 19:21:58 oga Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.7 2010/06/26 23:24:43 guenther Exp $ */ /* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */ /*- @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/extent.h> #include <sys/buf.h> #include <sys/device.h> diff --git a/sys/arch/mvme88k/dev/memc.c b/sys/arch/mvme88k/dev/memc.c index 5cdbf3fb3a3..86766fbc531 100644 --- a/sys/arch/mvme88k/dev/memc.c +++ b/sys/arch/mvme88k/dev/memc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memc.c,v 1.13 2006/11/16 23:21:56 miod Exp $ */ +/* $OpenBSD: memc.c,v 1.14 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -34,7 +34,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme88k/dev/pcctwo.c b/sys/arch/mvme88k/dev/pcctwo.c index d3886aaf660..799c24e18fe 100644 --- a/sys/arch/mvme88k/dev/pcctwo.c +++ b/sys/arch/mvme88k/dev/pcctwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcctwo.c,v 1.29 2006/05/08 14:36:10 miod Exp $ */ +/* $OpenBSD: pcctwo.c,v 1.30 2010/06/26 23:24:43 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt * All rights reserved. @@ -31,7 +31,6 @@ #include <sys/conf.h> #include <sys/ioctl.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/tty.h> #include <sys/uio.h> #include <sys/systm.h> diff --git a/sys/arch/mvme88k/dev/vmel.c b/sys/arch/mvme88k/dev/vmel.c index 89bdcce3550..0d76f1d85a2 100644 --- a/sys/arch/mvme88k/dev/vmel.c +++ b/sys/arch/mvme88k/dev/vmel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmel.c,v 1.16 2005/11/25 22:14:32 miod Exp $ */ +/* $OpenBSD: vmel.c,v 1.17 2010/06/26 23:24:44 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -27,7 +27,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/device.h> diff --git a/sys/arch/mvme88k/dev/vmes.c b/sys/arch/mvme88k/dev/vmes.c index c0a60f86177..cf3bee2f7f4 100644 --- a/sys/arch/mvme88k/dev/vmes.c +++ b/sys/arch/mvme88k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.19 2005/11/25 22:14:32 miod Exp $ */ +/* $OpenBSD: vmes.c,v 1.20 2010/06/26 23:24:44 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -27,7 +27,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/device.h> diff --git a/sys/arch/mvme88k/mvme88k/bus_dma.c b/sys/arch/mvme88k/mvme88k/bus_dma.c index 8f684518eb4..1cff01753b7 100644 --- a/sys/arch/mvme88k/mvme88k/bus_dma.c +++ b/sys/arch/mvme88k/mvme88k/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.14 2010/03/29 19:21:58 oga Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.15 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */ /*- @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/extent.h> #include <sys/buf.h> #include <sys/device.h> diff --git a/sys/arch/mvmeppc/dev/cpu.c b/sys/arch/mvmeppc/dev/cpu.c index 66f513f4943..17368b1ce80 100644 --- a/sys/arch/mvmeppc/dev/cpu.c +++ b/sys/arch/mvmeppc/dev/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.8 2004/11/18 16:10:28 miod Exp $ */ +/* $OpenBSD: cpu.c,v 1.9 2010/06/26 23:24:44 guenther Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -36,7 +36,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/device.h> #include <machine/autoconf.h> diff --git a/sys/arch/mvmeppc/mvmeppc/bus_dma.c b/sys/arch/mvmeppc/mvmeppc/bus_dma.c index 3698b8731c7..85c38e3ac0b 100644 --- a/sys/arch/mvmeppc/mvmeppc/bus_dma.c +++ b/sys/arch/mvmeppc/mvmeppc/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.26 2010/03/29 19:21:58 oga Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.27 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */ /*- @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/extent.h> #include <sys/buf.h> #include <sys/device.h> diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c index 5fc73e31ddf..94b49aa9d3f 100644 --- a/sys/arch/powerpc/powerpc/pmap.c +++ b/sys/arch/powerpc/powerpc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.114 2010/04/24 17:56:06 kettenis Exp $ */ +/* $OpenBSD: pmap.c,v 1.115 2010/06/26 23:24:44 guenther Exp $ */ /* * Copyright (c) 2001, 2002, 2007 Dale Rahn. @@ -78,7 +78,6 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/queue.h> -#include <sys/user.h> #include <sys/systm.h> #include <sys/pool.h> diff --git a/sys/arch/sgi/sgi/bus_dma.c b/sys/arch/sgi/sgi/bus_dma.c index ae22471d81c..c7e7ad201ef 100644 --- a/sys/arch/sgi/sgi/bus_dma.c +++ b/sys/arch/sgi/sgi/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.18 2010/03/29 19:21:58 oga Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.19 2010/06/26 23:24:44 guenther Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -60,7 +60,6 @@ #include <sys/proc.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/user.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/sh/sh/locore_c.c b/sys/arch/sh/sh/locore_c.c index 0ede4c83f1c..319becc4e51 100644 --- a/sys/arch/sh/sh/locore_c.c +++ b/sys/arch/sh/sh/locore_c.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore_c.c,v 1.8 2010/04/21 03:03:26 deraadt Exp $ */ +/* $OpenBSD: locore_c.c,v 1.9 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: locore_c.c,v 1.13 2006/03/04 01:13:35 uwe Exp $ */ /*- @@ -107,7 +107,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/sched.h> #include <sys/proc.h> diff --git a/sys/arch/sh/sh/process_machdep.c b/sys/arch/sh/sh/process_machdep.c index e38105eade5..287ec43b087 100644 --- a/sys/arch/sh/sh/process_machdep.c +++ b/sys/arch/sh/sh/process_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process_machdep.c,v 1.3 2007/03/02 06:11:54 miod Exp $ */ +/* $OpenBSD: process_machdep.c,v 1.4 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: process_machdep.c,v 1.12 2006/01/21 04:12:22 uwe Exp $ */ /* @@ -125,11 +125,11 @@ #include <sys/time.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/vnode.h> #include <sys/ptrace.h> #include <machine/cpu.h> +#include <machine/pcb.h> #include <machine/psl.h> #include <machine/reg.h> diff --git a/sys/arch/sh/sh/trap.c b/sys/arch/sh/sh/trap.c index 24e3dd76e04..18fd463da0d 100644 --- a/sys/arch/sh/sh/trap.c +++ b/sys/arch/sh/sh/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.14 2008/10/04 19:21:50 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.15 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: exception.c,v 1.32 2006/09/04 23:57:52 uwe Exp $ */ /* $NetBSD: syscall.c,v 1.6 2006/03/07 07:21:50 thorpej Exp $ */ @@ -84,7 +84,6 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/pool.h> -#include <sys/user.h> #include <sys/kernel.h> #include <sys/signal.h> #include <sys/syscall.h> @@ -103,6 +102,7 @@ #include <sh/cache.h> #include <sh/cpu.h> #include <sh/mmu.h> +#include <sh/pcb.h> #include <sh/trap.h> #include <sh/userret.h> #ifdef SH4 diff --git a/sys/arch/socppc/socppc/dma.c b/sys/arch/socppc/socppc/dma.c index 599bc0048db..e3f184996af 100644 --- a/sys/arch/socppc/socppc/dma.c +++ b/sys/arch/socppc/socppc/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.6 2010/03/29 19:21:58 oga Exp $ */ +/* $OpenBSD: dma.c,v 1.7 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/extent.h> #include <sys/buf.h> #include <sys/device.h> diff --git a/sys/arch/socppc/stand/boot/fdt.c b/sys/arch/socppc/stand/boot/fdt.c index 066f33d3d9e..89b5b9f4ec1 100644 --- a/sys/arch/socppc/stand/boot/fdt.c +++ b/sys/arch/socppc/stand/boot/fdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdt.c,v 1.3 2009/10/01 20:21:05 dms Exp $ */ +/* $OpenBSD: fdt.c,v 1.4 2010/06/26 23:24:44 guenther Exp $ */ /* * Copyright (c) 2009 Dariusz Swiderski <sfires@sfires.net> @@ -19,7 +19,6 @@ #include <sys/types.h> #include <sys/param.h> -//#include <sys/user.h> #include <machine/fdt.h> #include "libsa.h" diff --git a/sys/arch/solbourne/solbourne/autoconf.c b/sys/arch/solbourne/solbourne/autoconf.c index 4cf93eddd44..dd15907f719 100644 --- a/sys/arch/solbourne/solbourne/autoconf.c +++ b/sys/arch/solbourne/solbourne/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.10 2009/04/10 20:55:56 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.11 2010/06/26 23:24:44 guenther Exp $ */ /* OpenBSD: autoconf.c,v 1.64 2005/03/23 17:10:24 miod Exp */ /* @@ -56,7 +56,6 @@ #include <sys/socket.h> #include <sys/malloc.h> #include <sys/queue.h> -#include <sys/user.h> #include <net/if.h> diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c index 8d1f1224de4..a6622630094 100644 --- a/sys/arch/sparc/dev/dma.c +++ b/sys/arch/sparc/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.25 2008/12/26 15:13:07 miod Exp $ */ +/* $OpenBSD: dma.c,v 1.26 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/malloc.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sparc/autoconf.h> #include <sparc/cpu.h> diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index e721fa68cb7..fbc50506ab1 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.29 2010/06/07 19:54:33 miod Exp $ */ +/* $OpenBSD: esp.c,v 1.30 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */ /* @@ -105,7 +105,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/arch/sparc/dev/lebuffer.c b/sys/arch/sparc/dev/lebuffer.c index 74c5445bf78..bed9669017a 100644 --- a/sys/arch/sparc/dev/lebuffer.c +++ b/sys/arch/sparc/dev/lebuffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lebuffer.c,v 1.7 2008/12/26 15:13:07 miod Exp $ */ +/* $OpenBSD: lebuffer.c,v 1.8 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: lebuffer.c,v 1.3 1997/05/24 20:16:28 pk Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/malloc.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sparc/autoconf.h> #include <sparc/cpu.h> diff --git a/sys/arch/sparc/dev/qec.c b/sys/arch/sparc/dev/qec.c index 6ea0d664e6c..332a7b5ba75 100644 --- a/sys/arch/sparc/dev/qec.c +++ b/sys/arch/sparc/dev/qec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qec.c,v 1.17 2006/06/02 20:00:54 miod Exp $ */ +/* $OpenBSD: qec.c,v 1.18 2010/06/26 23:24:44 guenther Exp $ */ /* * Copyright (c) 1998 Theo de Raadt and Jason L. Wright. @@ -35,7 +35,6 @@ #include <sys/malloc.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c index 60f5073766b..04835270bc9 100644 --- a/sys/arch/sparc/dev/si.c +++ b/sys/arch/sparc/dev/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.32 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: si.c,v 1.33 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $ */ /*- @@ -94,7 +94,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/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 36c32bb1bf5..401a183e7c6 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.86 2010/06/22 16:27:45 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.87 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -57,7 +57,6 @@ #include <sys/malloc.h> #include <sys/queue.h> #include <sys/proc.h> -#include <sys/user.h> #include <net/if.h> diff --git a/sys/arch/sparc/sparc/sunos_machdep.c b/sys/arch/sparc/sparc/sunos_machdep.c index d013f076741..b2693a0b93a 100644 --- a/sys/arch/sparc/sparc/sunos_machdep.c +++ b/sys/arch/sparc/sparc/sunos_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunos_machdep.c,v 1.2 1997/08/08 08:27:41 downsj Exp $ */ +/* $OpenBSD: sunos_machdep.c,v 1.3 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: sunos_machdep.c,v 1.4 1996/10/05 23:44:33 mrg Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/namei.h> -#include <sys/user.h> #include <sys/filedesc.h> #include <sys/ioctl.h> #include <sys/mount.h> diff --git a/sys/arch/sparc/sparc/svr4_machdep.c b/sys/arch/sparc/sparc/svr4_machdep.c index 188a1e3ae60..1228ea135a0 100644 --- a/sys/arch/sparc/sparc/svr4_machdep.c +++ b/sys/arch/sparc/sparc/svr4_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_machdep.c,v 1.13 2005/03/21 22:34:33 miod Exp $ */ +/* $OpenBSD: svr4_machdep.c,v 1.14 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: svr4_machdep.c,v 1.24 1997/07/29 10:04:45 fair Exp $ */ /* @@ -32,7 +32,6 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/filedesc.h> #include <sys/ioctl.h> #include <sys/mount.h> diff --git a/sys/arch/vax/qbus/uba.c b/sys/arch/vax/qbus/uba.c index 2e2a37c0d02..ae3ca6d7f3e 100644 --- a/sys/arch/vax/qbus/uba.c +++ b/sys/arch/vax/qbus/uba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba.c,v 1.11 2005/11/24 04:52:26 brad Exp $ */ +/* $OpenBSD: uba.c,v 1.12 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: uba.c,v 1.57 2001/04/26 19:16:07 ragge Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -40,7 +40,6 @@ #include <sys/systm.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/kernel.h> diff --git a/sys/arch/vax/uba/qv.c b/sys/arch/vax/uba/qv.c index a70bc1345e1..ff4654e361b 100644 --- a/sys/arch/vax/uba/qv.c +++ b/sys/arch/vax/uba/qv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qv.c,v 1.14 2010/04/12 12:57:52 tedu Exp $ */ +/* $OpenBSD: qv.c,v 1.15 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: qv.c,v 1.2 1996/09/02 06:44:28 mycroft Exp $ */ /*- @@ -131,7 +131,6 @@ #include <sys/param.h> #include <sys/conf.h> -#include <sys/user.h> #include <vax/uba/qvioctl.h> #include <sys/tty.h> #include <sys/map.h> diff --git a/sys/arch/vax/vax/cfl.c b/sys/arch/vax/vax/cfl.c index 755dc404b60..547241a1ee7 100644 --- a/sys/arch/vax/vax/cfl.c +++ b/sys/arch/vax/vax/cfl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfl.c,v 1.6 2006/01/20 23:27:26 miod Exp $ */ +/* $OpenBSD: cfl.c,v 1.7 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: cfl.c,v 1.2 1998/04/13 12:10:26 ragge Exp $ */ /*- * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -42,7 +42,6 @@ #include <sys/systm.h> #include <sys/conf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/buf.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/crl.c b/sys/arch/vax/vax/crl.c index d940f7fca65..64ff68cf650 100644 --- a/sys/arch/vax/vax/crl.c +++ b/sys/arch/vax/vax/crl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crl.c,v 1.8 2006/01/20 23:27:26 miod Exp $ */ +/* $OpenBSD: crl.c,v 1.9 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: crl.c,v 1.6 2000/01/24 02:40:33 matt Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -40,7 +40,6 @@ #include <sys/systm.h> #include <sys/conf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/buf.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c index f331df902a6..f4e5397911d 100644 --- a/sys/arch/vax/vsa/asc_vsbus.c +++ b/sys/arch/vax/vsa/asc_vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_vsbus.c,v 1.10 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: asc_vsbus.c,v 1.11 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: asc_vsbus.c,v 1.22 2001/02/04 20:36:32 ragge Exp $ */ /*- @@ -41,7 +41,6 @@ #include <sys/device.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/reboot.h> #include <sys/queue.h> diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c index 605549cb5b7..9acd6581058 100644 --- a/sys/arch/vax/vsa/hdc9224.c +++ b/sys/arch/vax/vsa/hdc9224.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hdc9224.c,v 1.28 2010/05/22 17:10:23 deraadt Exp $ */ +/* $OpenBSD: hdc9224.c,v 1.29 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: hdc9224.c,v 1.16 2001/07/26 15:05:09 wiz Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -61,7 +61,6 @@ #include <sys/dkio.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/device.h> #include <sys/disklabel.h> #include <sys/disk.h> diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c index ebdabaaad3c..769286f1039 100644 --- a/sys/arch/vax/vsa/ncr.c +++ b/sys/arch/vax/vsa/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.25 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: ncr.c,v 1.26 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: ncr.c,v 1.32 2000/06/25 16:00:43 ragge Exp $ */ /*- @@ -51,7 +51,6 @@ #include <sys/buf.h> #include <sys/disk.h> #include <sys/proc.h> -#include <sys/user.h> #include <uvm/uvm_extern.h> diff --git a/sys/compat/common/kern_sig_43.c b/sys/compat/common/kern_sig_43.c index 4746ea7af49..976eb25a54e 100644 --- a/sys/compat/common/kern_sig_43.c +++ b/sys/compat/common/kern_sig_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig_43.c,v 1.7 2003/06/02 23:27:59 millert Exp $ */ +/* $OpenBSD: kern_sig_43.c,v 1.8 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: kern_sig_43.c,v 1.7 1996/03/14 19:31:47 christos Exp $ */ /* @@ -62,7 +62,6 @@ #include <machine/cpu.h> #include <uvm/uvm_extern.h> -#include <sys/user.h> /* for coredump */ int compat_43_sys_sigblock(p, v, retval) diff --git a/sys/compat/freebsd/freebsd_ptrace.c b/sys/compat/freebsd/freebsd_ptrace.c index dbcf8f1ad80..68d504fea4c 100644 --- a/sys/compat/freebsd/freebsd_ptrace.c +++ b/sys/compat/freebsd/freebsd_ptrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: freebsd_ptrace.c,v 1.6 2003/06/02 23:28:00 millert Exp $ */ +/* $OpenBSD: freebsd_ptrace.c,v 1.7 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: freebsd_ptrace.c,v 1.2 1996/05/03 17:03:12 christos Exp $ */ /*- @@ -44,7 +44,6 @@ #include <sys/errno.h> #include <sys/ptrace.h> #include <sys/uio.h> -#include <sys/user.h> #include <sys/mount.h> #include <sys/syscallargs.h> diff --git a/sys/compat/hpux/hppa/hpux_exec.c b/sys/compat/hpux/hppa/hpux_exec.c index 8c7bd9114c3..90783f6040b 100644 --- a/sys/compat/hpux/hppa/hpux_exec.c +++ b/sys/compat/hpux/hppa/hpux_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_exec.c,v 1.4 2009/03/05 19:52:23 kettenis Exp $ */ +/* $OpenBSD: hpux_exec.c,v 1.5 2010/06/26 23:24:44 guenther Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff. All rights reserved. @@ -42,7 +42,6 @@ #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> -#include <sys/user.h> #include <sys/vnode.h> #include <sys/mman.h> #include <sys/stat.h> diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c index 3bc2a347a85..d9c7ebd83c3 100644 --- a/sys/compat/hpux/hpux_compat.c +++ b/sys/compat/hpux/hpux_compat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_compat.c,v 1.32 2010/01/28 19:59:07 miod Exp $ */ +/* $OpenBSD: hpux_compat.c,v 1.33 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: hpux_compat.c,v 1.35 1997/05/08 16:19:48 mycroft Exp $ */ /* @@ -66,7 +66,7 @@ #include <sys/pool.h> #include <sys/mount.h> #include <sys/ipc.h> -#include <sys/user.h> +#include <sys/sysctl.h> #include <sys/mman.h> #include <machine/cpu.h> diff --git a/sys/compat/hpux/hpux_file.c b/sys/compat/hpux/hpux_file.c index a3596136e40..1f370a4a47b 100644 --- a/sys/compat/hpux/hpux_file.c +++ b/sys/compat/hpux/hpux_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_file.c,v 1.19 2008/09/19 12:24:55 art Exp $ */ +/* $OpenBSD: hpux_file.c,v 1.20 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: hpux_file.c,v 1.5 1997/04/27 21:40:48 thorpej Exp $ */ /* @@ -63,7 +63,6 @@ #include <sys/malloc.h> #include <sys/mount.h> #include <sys/ipc.h> -#include <sys/user.h> #include <sys/mman.h> #include <machine/cpu.h> diff --git a/sys/compat/hpux/m68k/hpux_exec.c b/sys/compat/hpux/m68k/hpux_exec.c index 97653f9c56d..be7fdc5a305 100644 --- a/sys/compat/hpux/m68k/hpux_exec.c +++ b/sys/compat/hpux/m68k/hpux_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_exec.c,v 1.4 2009/03/05 19:52:23 kettenis Exp $ */ +/* $OpenBSD: hpux_exec.c,v 1.5 2010/06/26 23:24:44 guenther Exp $ */ /* $NetBSD: hpux_exec.c,v 1.8 1997/03/16 10:14:44 thorpej Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> -#include <sys/user.h> #include <sys/vnode.h> #include <sys/mman.h> #include <sys/stat.h> 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" diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index c5ca33402ee..f14c19f1598 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prof.c,v 1.17 2007/03/15 10:22:30 art Exp $ */ +/* $OpenBSD: subr_prof.c,v 1.18 2010/06/26 23:24:45 guenther Exp $ */ /* $NetBSD: subr_prof.c,v 1.12 1996/04/22 01:38:50 christos Exp $ */ /*- @@ -36,7 +36,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> +#include <sys/resourcevar.h> #include <sys/mount.h> #include <sys/syscallargs.h> diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index e4473890395..d3944c41811 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_process.c,v 1.45 2010/05/02 11:15:29 kettenis Exp $ */ +/* $OpenBSD: sys_process.c,v 1.46 2010/06/26 23:24:45 guenther Exp $ */ /* $NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $ */ /*- @@ -58,7 +58,6 @@ #include <sys/malloc.h> #include <sys/ptrace.h> #include <sys/uio.h> -#include <sys/user.h> #include <sys/sched.h> #include <sys/mount.h> diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index df96672e5b5..7d694a41208 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ddp_usrreq.c,v 1.12 2008/05/23 16:03:03 thib Exp $ */ +/* $OpenBSD: ddp_usrreq.c,v 1.13 2010/06/26 23:24:45 guenther Exp $ */ /* * Copyright (c) 1990,1994 Regents of The University of Michigan. @@ -56,7 +56,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/mbuf.h> #include <sys/ioctl.h> #include <sys/socket.h> diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 35e1ce80e63..47da62265b1 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ch.c,v 1.38 2010/06/15 04:11:34 dlg Exp $ */ +/* $OpenBSD: ch.c,v 1.39 2010/06/26 23:24:45 guenther Exp $ */ /* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/ioctl.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/chio.h> #include <sys/device.h> #include <sys/malloc.h> diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c index 236ddb5d748..adfab839b45 100644 --- a/sys/scsi/ss.c +++ b/sys/scsi/ss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss.c,v 1.75 2010/06/26 21:27:55 krw Exp $ */ +/* $OpenBSD: ss.c,v 1.76 2010/06/26 23:24:45 guenther Exp $ */ /* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/ioctl.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/device.h> #include <sys/conf.h> #include <sys/scanio.h> diff --git a/sys/scsi/ss_mustek.c b/sys/scsi/ss_mustek.c index a8979d5e267..e70d91463ea 100644 --- a/sys/scsi/ss_mustek.c +++ b/sys/scsi/ss_mustek.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss_mustek.c,v 1.23 2010/06/11 12:02:44 krw Exp $ */ +/* $OpenBSD: ss_mustek.c,v 1.24 2010/06/26 23:24:45 guenther Exp $ */ /* $NetBSD: ss_mustek.c,v 1.4 1996/05/05 19:52:57 christos Exp $ */ /* @@ -55,7 +55,6 @@ #include <sys/ioctl.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/device.h> #include <sys/conf.h> /* for cdevsw */ #include <sys/scanio.h> diff --git a/sys/scsi/ss_scanjet.c b/sys/scsi/ss_scanjet.c index 9c66d7d0b15..4e200228b71 100644 --- a/sys/scsi/ss_scanjet.c +++ b/sys/scsi/ss_scanjet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss_scanjet.c,v 1.40 2010/06/11 12:02:44 krw Exp $ */ +/* $OpenBSD: ss_scanjet.c,v 1.41 2010/06/26 23:24:45 guenther Exp $ */ /* $NetBSD: ss_scanjet.c,v 1.6 1996/05/18 22:58:01 christos Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/ioctl.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/device.h> #include <sys/conf.h> /* for cdevsw */ #include <sys/scanio.h> diff --git a/sys/scsi/st.c b/sys/scsi/st.c index cd5dc44f612..49efecd5da0 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.99 2010/06/25 04:29:39 dlg Exp $ */ +/* $OpenBSD: st.c,v 1.100 2010/06/26 23:24:45 guenther Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -65,7 +65,6 @@ #include <sys/malloc.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/mtio.h> #include <sys/device.h> #include <sys/conf.h> |