diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-06-26 23:24:46 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-06-26 23:24:46 +0000 |
| commit | eb23aac2d7eb652ee88e15b7d32db9f5f6b307b4 (patch) | |
| tree | 03429ad5db3924bb64a9dc031b6ea1931ca9c8e6 /sys/arch | |
| parent | b67846532dd844d067cf0399f4ba4c50503dbc14 (diff) | |
Don't #include <sys/user.h> into files that don't need the stuff
it defines. In some cases, this means pulling in uvm.h or pcb.h
instead, but most of the inclusions were just noise. Tested on
alpha, amd64, armish, hppa, i386, macpcc, sgi, sparc64, and vax,
mostly by krw and naddy.
ok krw@
Diffstat (limited to 'sys/arch')
78 files changed, 94 insertions, 157 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> |