diff options
64 files changed, 64 insertions, 76 deletions
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h index f83e2f4b2617..ecd330c7b46b 100644 --- a/lib/libc_r/uthread/pthread_private.h +++ b/lib/libc_r/uthread/pthread_private.h @@ -52,6 +52,7 @@ #include <setjmp.h> #include <signal.h> #include <stdio.h> +#include <sys/param.h> #include <sys/queue.h> #include <sys/types.h> #include <sys/time.h> @@ -60,6 +61,10 @@ #include <spinlock.h> #include <ucontext.h> #include <pthread_np.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> /* * Define machine dependent macros to get and set the stack pointer diff --git a/lib/libc_r/uthread/uthread_init.c b/lib/libc_r/uthread/uthread_init.c index d3a2b45617d4..fadc277e7f44 100644 --- a/lib/libc_r/uthread/uthread_init.c +++ b/lib/libc_r/uthread/uthread_init.c @@ -49,7 +49,6 @@ #include <sys/sysctl.h> #include <sys/time.h> #include <sys/ttycom.h> -#include <sys/user.h> #include <sys/wait.h> #include <sys/mman.h> #include <dirent.h> diff --git a/lib/libc_r/uthread/uthread_jmp.c b/lib/libc_r/uthread/uthread_jmp.c index df9759fb81dc..5aa0001819ba 100644 --- a/lib/libc_r/uthread/uthread_jmp.c +++ b/lib/libc_r/uthread/uthread_jmp.c @@ -34,7 +34,6 @@ #include <unistd.h> #include <setjmp.h> #include <sys/param.h> -#include <sys/user.h> #include <machine/reg.h> #include <pthread.h> #include "pthread_private.h" diff --git a/lib/libc_r/uthread/uthread_stack.c b/lib/libc_r/uthread/uthread_stack.c index 63fa4cdba10c..b2f3f57bca66 100644 --- a/lib/libc_r/uthread/uthread_stack.c +++ b/lib/libc_r/uthread/uthread_stack.c @@ -31,7 +31,6 @@ #include <sys/mman.h> #include <sys/param.h> #include <sys/queue.h> -#include <sys/user.h> #include <stdlib.h> #include <pthread.h> #include "un-namespace.h" diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index 548474d65316..3291738490cc 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -49,7 +49,6 @@ #include <sys/sysctl.h> #include <sys/time.h> #include <sys/ttycom.h> -#include <sys/user.h> #include <sys/wait.h> #include <sys/mman.h> #include <dirent.h> diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index bda67ca5c317..47183d720d49 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -54,6 +54,7 @@ #include <sys/errno.h> #include <sys/msg.h> #include <sys/time.h> +#include <sys/param.h> #include <sys/queue.h> #include <pthread_np.h> #include <sched.h> @@ -69,6 +70,10 @@ #include <machine/atomic.h> #include <sys/thr.h> #include <sys/umtx.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #if defined(_PTHREADS_INVARIANTS) /* diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c index b4063ad564ff..2b6ba8e4f0d4 100644 --- a/lib/libthr/thread/thr_stack.c +++ b/lib/libthr/thread/thr_stack.c @@ -30,7 +30,6 @@ #include <sys/mman.h> #include <sys/param.h> #include <sys/queue.h> -#include <sys/user.h> #include <stdlib.h> #include <pthread.h> #include "thr_private.h" diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 1c13205cd354..2d330a63bb0a 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -43,8 +43,8 @@ __FBSDID("$FreeBSD$"); #include <sys/stat.h> #include <sys/param.h> -#include <sys/user.h> #include <sys/sysctl.h> +#include <vm/vm_param.h> #include <err.h> #include <errno.h> diff --git a/sys/alpha/alpha/db_trace.c b/sys/alpha/alpha/db_trace.c index 4e76b393faae..fcee2f3f2e5f 100644 --- a/sys/alpha/alpha/db_trace.c +++ b/sys/alpha/alpha/db_trace.c @@ -48,11 +48,11 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/kdb.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/sysent.h> #include <machine/db_machdep.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <ddb/ddb.h> #include <ddb/db_sym.h> diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c index 243c17273466..7e8aa5e5abcd 100644 --- a/sys/alpha/alpha/fp_emulate.c +++ b/sys/alpha/alpha/fp_emulate.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/lock.h> #include <sys/mutex.h> -#include <sys/user.h> #include <vm/vm.h> #include <vm/vm_kern.h> @@ -47,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include <machine/fpu.h> #include <machine/inst.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/reg.h> #include <alpha/alpha/ieee_float.h> diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 01d46e88d8fd..efa59417178c 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -132,7 +132,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_object.h> #include <vm/vm_pager.h> -#include <sys/user.h> #include <sys/ptrace.h> #include <sys/ucontext.h> #include <machine/clock.h> @@ -141,6 +140,7 @@ __FBSDID("$FreeBSD$"); #include <machine/pal.h> #include <machine/cpuconf.h> #include <machine/bootinfo.h> +#include <machine/pcb.h> #include <machine/rpb.h> #include <machine/prom.h> #include <machine/chipset.h> diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c index 33bfe5f3cc5a..2380c90379e4 100644 --- a/sys/alpha/alpha/mp_machdep.c +++ b/sys/alpha/alpha/mp_machdep.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <sys/smp.h> #include <sys/sysctl.h> #include <sys/bus.h> -#include <sys/user.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -51,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include <machine/atomic.h> #include <machine/clock.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/pmap.h> #include <machine/prom.h> #include <machine/rpb.h> diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c index 9a2cbd661cb3..789a93a13e7b 100644 --- a/sys/alpha/alpha/pmap.c +++ b/sys/alpha/alpha/pmap.c @@ -173,9 +173,8 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_pager.h> #include <vm/uma.h> -#include <sys/user.h> - #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/rpb.h> #ifndef PMAP_SHPGPERPROC diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c index fe0a6957b881..a861f3002c87 100644 --- a/sys/alpha/alpha/prom.c +++ b/sys/alpha/alpha/prom.c @@ -35,10 +35,10 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/cons.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/prom.h> #include <machine/rpb.h> #include <machine/vmparam.h> diff --git a/sys/alpha/alpha/sys_machdep.c b/sys/alpha/alpha/sys_machdep.c index e6b9f30fa995..420f666e787e 100644 --- a/sys/alpha/alpha/sys_machdep.c +++ b/sys/alpha/alpha/sys_machdep.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/sysent.h> #include <sys/sysproto.h> -#include <sys/user.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -50,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <machine/cpu.h> +#include <machine/pcb.h> #include <machine/sysarch.h> #include <vm/vm_kern.h> /* for kernel_map */ diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c index 634a0cd9e5b5..8a076a5aaec9 100644 --- a/sys/alpha/alpha/trap.c +++ b/sys/alpha/alpha/trap.c @@ -55,12 +55,12 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <vm/vm_extern.h> #include <vm/vm_param.h> -#include <sys/user.h> #include <sys/ptrace.h> #include <machine/clock.h> #include <machine/md_var.h> #include <machine/reg.h> #include <machine/pal.h> +#include <machine/pcb.h> #include <machine/fpu.h> #ifdef KTRACE diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c index e77e0fed633e..614af76b2f34 100644 --- a/sys/alpha/alpha/vm_machdep.c +++ b/sys/alpha/alpha/vm_machdep.c @@ -89,6 +89,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/fpu.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/prom.h> #include <vm/vm.h> @@ -99,8 +100,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <vm/vm_extern.h> -#include <sys/user.h> - /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child diff --git a/sys/alpha/linux/linux_machdep.c b/sys/alpha/linux/linux_machdep.c index 6cd0834e44d5..7798fbfc1a61 100644 --- a/sys/alpha/linux/linux_machdep.c +++ b/sys/alpha/linux/linux_machdep.c @@ -36,10 +36,13 @@ __FBSDID("$FreeBSD$"); #include <sys/mount.h> #include <sys/mutex.h> #include <sys/proc.h> +#include <sys/resource.h> +#include <sys/resourcevar.h> #include <sys/syscallsubr.h> #include <sys/sysproto.h> #include <sys/unistd.h> -#include <sys/user.h> + +#include <machine/pcb.h> #include <vm/vm.h> #include <vm/pmap.h> diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c index 9872d316993c..fd5ccaa54e43 100644 --- a/sys/alpha/osf1/osf1_misc.c +++ b/sys/alpha/osf1/osf1_misc.c @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysproto.h> #include <sys/systm.h> #include <sys/unistd.h> -#include <sys/user.h> #include <sys/utsname.h> #include <sys/vnode.h> #include <sys/wait.h> @@ -82,6 +81,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cpuconf.h> #include <machine/fpu.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/rpb.h> #include <alpha/osf1/exec_ecoff.h> diff --git a/sys/alpha/osf1/osf1_signal.c b/sys/alpha/osf1/osf1_signal.c index 0aecf0170f62..63a562c235a6 100644 --- a/sys/alpha/osf1/osf1_signal.c +++ b/sys/alpha/osf1/osf1_signal.c @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_object.h> #include <vm/vm_pager.h> -#include <sys/user.h> #include <sys/ptrace.h> #include <sys/cons.h> #include <machine/clock.h> @@ -83,6 +82,7 @@ __FBSDID("$FreeBSD$"); #include <ddb/ddb.h> #include <alpha/alpha/db_instruction.h> #include <sys/vnode.h> +#include <machine/pcb.h> #include <alpha/osf1/osf1_signal.h> #include <alpha/osf1/osf1_proto.h> diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 38f1c161e794..0b2071e11d9d 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <sys/rman.h> #include <sys/signalvar.h> -#include <sys/user.h> #include <machine/cputypes.h> #include <machine/frame.h> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index ee4e1b7559ef..8f1fb34880f7 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -82,6 +82,8 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/eventhandler.h> +#include <machine/pcb.h> + #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_kern.h> @@ -91,7 +93,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_pager.h> #include <vm/vm_extern.h> -#include <sys/user.h> #include <sys/exec.h> #include <sys/cons.h> diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 5f815ad014cf..dfa88065af3a 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -116,7 +116,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> #include <sys/sx.h> -#include <sys/user.h> #include <sys/vmmeter.h> #include <sys/sched.h> #include <sys/sysctl.h> @@ -138,6 +137,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/specialreg.h> #ifdef SMP #include <machine/smp.h> diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index a33679d21549..23d5b0601a14 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include <sys/smp.h> #include <sys/sysctl.h> #include <sys/unistd.h> -#include <sys/user.h> #include <sys/vnode.h> #include <sys/vmmeter.h> diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 4f0834b6f353..2b3f75f7f7a0 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -56,12 +56,12 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/mutex.h> #include <sys/proc.h> +#include <sys/resourcevar.h> #include <sys/signalvar.h> #include <sys/sysctl.h> #include <sys/syscallsubr.h> #include <sys/sysent.h> #include <sys/sysproto.h> -#include <sys/user.h> #include <sys/vnode.h> #include <vm/vm.h> @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/specialreg.h> #include <amd64/linux32/linux.h> diff --git a/sys/arm/arm/db_trace.c b/sys/arm/arm/db_trace.c index 7b63c8fa10cb..45e189231583 100644 --- a/sys/arm/arm/db_trace.c +++ b/sys/arm/arm/db_trace.c @@ -36,12 +36,12 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> -#include <sys/user.h> #include <sys/kdb.h> #include <machine/armreg.h> #include <machine/asm.h> #include <machine/cpufunc.h> #include <machine/db_machdep.h> +#include <machine/pcb.h> #include <machine/vmparam.h> #include <ddb/ddb.h> #include <ddb/db_access.h> diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c index 9bc390d6b772..ed6ad2aec65b 100644 --- a/sys/arm/arm/trap.c +++ b/sys/arm/arm/trap.c @@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/mutex.h> @@ -112,6 +111,7 @@ __FBSDID("$FreeBSD$"); #include <machine/katelib.h> #include <machine/cpu.h> #include <machine/intr.h> +#include <machine/pcb.h> #include <machine/proc.h> #include <machine/swi.h> #if !defined(DDB) diff --git a/sys/arm/arm/undefined.c b/sys/arm/arm/undefined.c index 8632867de82c..8418797987de 100644 --- a/sys/arm/arm/undefined.c +++ b/sys/arm/arm/undefined.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include <sys/signal.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/syslog.h> #include <sys/vmmeter.h> #include <sys/types.h> diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index 4e37463ac07a..40a5ce17eda8 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -91,7 +91,6 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/socketvar.h> #include <sys/sf_buf.h> -#include <sys/user.h> #include <machine/cpu.h> #include <machine/pcb.h> #include <vm/vm.h> diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 0326242ecd2e..02c38a0c594a 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -64,8 +64,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysproto.h> #include <sys/systm.h> #include <sys/unistd.h> -#include <sys/user.h> -#include <sys/utsname.h> #include <sys/vnode.h> #include <sys/wait.h> diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index a0935651c60a..6ed6ea9bdafa 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -57,13 +57,13 @@ __FBSDID("$FreeBSD$"); #include <sys/resource.h> #include <sys/resourcevar.h> #include <sys/sem.h> +#include <sys/signalvar.h> #include <sys/stat.h> #include <sys/sx.h> #include <sys/sysproto.h> #include <sys/time.h> #include <sys/times.h> #include <sys/uio.h> -#include <sys/user.h> #include <sys/vnode.h> #include <sys/wait.h> diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 897ddc61316c..80099aa66a2e 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -91,7 +91,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_pager.h> #include <vm/vm_extern.h> -#include <sys/user.h> #include <sys/exec.h> #include <sys/cons.h> @@ -114,7 +113,8 @@ __FBSDID("$FreeBSD$"); #include <machine/intr_machdep.h> #include <machine/md_var.h> #include <machine/pc/bios.h> -#include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ +#include <machine/pcb.h> +#include <machine/pcb_ext.h> #include <machine/proc.h> #ifdef PERFMON #include <machine/perfmon.h> diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index c5c8dc2dbdd7..b8dea6f222c8 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -116,7 +116,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/proc.h> #include <sys/sx.h> -#include <sys/user.h> #include <sys/vmmeter.h> #include <sys/sched.h> #include <sys/sysctl.h> @@ -138,6 +137,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <machine/specialreg.h> #ifdef SMP #include <machine/smp.h> diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 57bb98217d62..cc317980573e 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/smp.h> #include <sys/sysproto.h> -#include <sys/user.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -52,7 +51,8 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <machine/cpu.h> -#include <machine/pcb_ext.h> /* pcb.h included by sys/user.h */ +#include <machine/pcb.h> +#include <machine/pcb_ext.h> #include <machine/proc.h> #include <machine/sysarch.h> diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c index 1d002f13ef39..e22929b5d5b3 100644 --- a/sys/i386/i386/vm86.c +++ b/sys/i386/i386/vm86.c @@ -39,10 +39,9 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <vm/vm_page.h> -#include <sys/user.h> - #include <machine/md_var.h> -#include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ +#include <machine/pcb.h> +#include <machine/pcb_ext.h> #include <machine/psl.h> #include <machine/specialreg.h> #include <machine/sysarch.h> diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index a6985dee758d..2a97b9d38bd1 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #include <sys/smp.h> #include <sys/sysctl.h> #include <sys/unistd.h> -#include <sys/user.h> #include <sys/vnode.h> #include <sys/vmmeter.h> diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 47fb58f60371..4a80533d5917 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include <sys/syslog.h> #endif #include <sys/signalvar.h> -#include <sys/user.h> #include <machine/asmacros.h> #include <machine/cputypes.h> diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 7c7386012c0f..20ad3a189cc3 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_object.h> #include <vm/vm_pager.h> -#include <sys/user.h> #include <sys/ptrace.h> #include <machine/clock.h> #include <machine/cpu.h> @@ -91,6 +90,7 @@ __FBSDID("$FreeBSD$"); #include <machine/efi.h> #include <machine/unwind.h> #include <i386/include/specialreg.h> +#include <machine/pcb.h> u_int64_t processor_frequency; u_int64_t bus_frequency; diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c index 2803ae0ad3de..930e3a95ca34 100644 --- a/sys/ia64/ia64/trap.c +++ b/sys/ia64/ia64/trap.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <vm/vm_extern.h> #include <vm/vm_param.h> -#include <sys/user.h> #include <sys/ptrace.h> #include <machine/clock.h> #include <machine/cpu.h> @@ -67,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include <machine/pal.h> #include <machine/fpu.h> #include <machine/efi.h> +#include <machine/pcb.h> #ifdef SMP #include <machine/smp.h> #endif diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c index 354dcf11182b..ef116e50e741 100644 --- a/sys/ia64/ia64/vm_machdep.c +++ b/sys/ia64/ia64/vm_machdep.c @@ -85,6 +85,7 @@ #include <machine/cpu.h> #include <machine/fpu.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <vm/vm.h> #include <vm/vm_param.h> @@ -94,8 +95,6 @@ #include <vm/vm_map.h> #include <vm/vm_extern.h> -#include <sys/user.h> - #include <i386/include/psl.h> void diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index ce2276bef492..84f6fd2a2b51 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/pmap.h> #include <vm/vm_map.h> -#include <sys/user.h> #include <sys/copyright.h> void mi_startup(void); /* Should be elsewhere */ diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 92ed0242f34f..e21cb0068ff7 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -51,12 +51,12 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/pioctl.h> #include <sys/namei.h> +#include <sys/resourcevar.h> #include <sys/sf_buf.h> #include <sys/syscallsubr.h> #include <sys/sysent.h> #include <sys/shm.h> #include <sys/sysctl.h> -#include <sys/user.h> #include <sys/vnode.h> #ifdef KTRACE #include <sys/ktrace.h> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 12895e70bfd4..e3ae64b1d613 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <vm/vm_page.h> #include <vm/uma.h> -#include <sys/user.h> /* Required to be non-static for SysVR4 emulator */ MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status"); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index fe3601e86661..ae8cce3ca956 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include <sys/ktrace.h> #include <sys/unistd.h> #include <sys/sx.h> +#include <sys/signalvar.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -71,7 +72,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/uma.h> -#include <sys/user.h> #include <machine/critical.h> #ifndef _SYS_SYSPROTO_H_ diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 7063ed3b401b..b5f617c4ad59 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$"); #include <sys/vnode.h> #include <sys/ptrace.h> #include <sys/sx.h> -#include <sys/user.h> #include <sys/malloc.h> +#include <sys/signalvar.h> #include <machine/reg.h> diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index e5f7238625af..1e38c6187991 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -88,7 +88,6 @@ #include <vm/vm_pager.h> #include <vm/vm_extern.h> -#include <sys/user.h> #include <sys/exec.h> #include <sys/cons.h> @@ -111,7 +110,8 @@ #include <machine/intr_machdep.h> #include <machine/md_var.h> #include <machine/pc/bios.h> -#include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ +#include <machine/pcb.h> +#include <machine/pcb_ext.h> #include <machine/proc.h> #ifdef PERFMON #include <machine/perfmon.h> diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index e5f7238625af..1e38c6187991 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -88,7 +88,6 @@ #include <vm/vm_pager.h> #include <vm/vm_extern.h> -#include <sys/user.h> #include <sys/exec.h> #include <sys/cons.h> @@ -111,7 +110,8 @@ #include <machine/intr_machdep.h> #include <machine/md_var.h> #include <machine/pc/bios.h> -#include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ +#include <machine/pcb.h> +#include <machine/pcb_ext.h> #include <machine/proc.h> #ifdef PERFMON #include <machine/perfmon.h> diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index b98689b7d437..c09fcf50978f 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -97,13 +97,13 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_object.h> #include <vm/vm_pager.h> -#include <sys/user.h> #include <sys/ptrace.h> #include <machine/bat.h> #include <machine/clock.h> #include <machine/cpu.h> #include <machine/md_var.h> #include <machine/metadata.h> +#include <machine/pcb.h> #include <machine/reg.h> #include <machine/fpu.h> #include <machine/vmparam.h> diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c index d6ed9ca6fd30..ab36e46d4712 100644 --- a/sys/powerpc/aim/trap.c +++ b/sys/powerpc/aim/trap.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysent.h> #include <sys/systm.h> #include <sys/uio.h> -#include <sys/user.h> #ifdef KTRACE #include <sys/ktrace.h> #endif diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c index 3b1921364fb7..fb93d5c223e2 100644 --- a/sys/powerpc/aim/vm_machdep.c +++ b/sys/powerpc/aim/vm_machdep.c @@ -89,6 +89,7 @@ #include <machine/fpu.h> #include <machine/frame.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <dev/ofw/openfirm.h> @@ -99,8 +100,6 @@ #include <vm/vm_map.h> #include <vm/vm_extern.h> -#include <sys/user.h> - /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child diff --git a/sys/powerpc/powerpc/db_trace.c b/sys/powerpc/powerpc/db_trace.c index 7c9699529b0d..3b489e8543b2 100644 --- a/sys/powerpc/powerpc/db_trace.c +++ b/sys/powerpc/powerpc/db_trace.c @@ -32,13 +32,13 @@ #include <sys/systm.h> #include <sys/kdb.h> #include <sys/proc.h> -#include <sys/user.h> #include <vm/vm.h> #include <vm/pmap.h> #include <vm/vm_extern.h> #include <machine/db_machdep.h> +#include <machine/pcb.h> #include <machine/spr.h> #include <machine/trap.h> diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c index 21492af72090..3504321cfbc5 100644 --- a/sys/powerpc/powerpc/fpu.c +++ b/sys/powerpc/powerpc/fpu.c @@ -38,9 +38,9 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/systm.h> #include <sys/limits.h> -#include <sys/user.h> #include <machine/fpu.h> +#include <machine/pcb.h> #include <machine/psl.h> void diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index b98689b7d437..c09fcf50978f 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -97,13 +97,13 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_object.h> #include <vm/vm_pager.h> -#include <sys/user.h> #include <sys/ptrace.h> #include <machine/bat.h> #include <machine/clock.h> #include <machine/cpu.h> #include <machine/md_var.h> #include <machine/metadata.h> +#include <machine/pcb.h> #include <machine/reg.h> #include <machine/fpu.h> #include <machine/vmparam.h> diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c index 54af23236779..edc744669f48 100644 --- a/sys/powerpc/powerpc/mp_machdep.c +++ b/sys/powerpc/powerpc/mp_machdep.c @@ -39,7 +39,6 @@ #include <vm/vm.h> #include <vm/pmap.h> #include <vm/vm_map.h> -#include <sys/user.h> #include <machine/atomic.h> #include <machine/pmap.h> diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c index d6ed9ca6fd30..ab36e46d4712 100644 --- a/sys/powerpc/powerpc/trap.c +++ b/sys/powerpc/powerpc/trap.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysent.h> #include <sys/systm.h> #include <sys/uio.h> -#include <sys/user.h> #ifdef KTRACE #include <sys/ktrace.h> #endif diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index 3b1921364fb7..fb93d5c223e2 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -89,6 +89,7 @@ #include <machine/fpu.h> #include <machine/frame.h> #include <machine/md_var.h> +#include <machine/pcb.h> #include <dev/ofw/openfirm.h> @@ -99,8 +100,6 @@ #include <vm/vm_map.h> #include <vm/vm_extern.h> -#include <sys/user.h> - /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child diff --git a/sys/sparc64/sparc64/db_trace.c b/sys/sparc64/sparc64/db_trace.c index a777f556d622..dc6e4bb5bc92 100644 --- a/sys/sparc64/sparc64/db_trace.c +++ b/sys/sparc64/sparc64/db_trace.c @@ -32,13 +32,13 @@ #include <sys/linker_set.h> #include <sys/proc.h> #include <sys/sysent.h> -#include <sys/user.h> #include <vm/vm.h> #include <vm/vm_page.h> #include <vm/vm_map.h> #include <machine/cpu.h> +#include <machine/pcb.h> #include <machine/trap.h> #include <machine/vmparam.h> diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c index 50b8cc535bea..495a2d6e9b4f 100644 --- a/sys/sparc64/sparc64/machdep.c +++ b/sys/sparc64/sparc64/machdep.c @@ -67,9 +67,7 @@ #include <sys/sysent.h> #include <sys/sysproto.h> #include <sys/timetc.h> -#include <sys/user.h> #include <sys/ucontext.h> -#include <sys/user.h> #include <sys/ucontext.h> #include <sys/exec.h> @@ -97,6 +95,7 @@ #include <machine/metadata.h> #include <machine/ofw_machdep.h> #include <machine/ofw_mem.h> +#include <machine/pcb.h> #include <machine/smp.h> #include <machine/pmap.h> #include <machine/pstate.h> diff --git a/sys/sparc64/sparc64/rwindow.c b/sys/sparc64/sparc64/rwindow.c index dc877d4046b8..5ea877413bd8 100644 --- a/sys/sparc64/sparc64/rwindow.c +++ b/sys/sparc64/sparc64/rwindow.c @@ -33,9 +33,9 @@ #include <sys/systm.h> #include <sys/ktr.h> #include <sys/proc.h> -#include <sys/user.h> #include <machine/frame.h> +#include <machine/pcb.h> CTASSERT((1 << RW_SHIFT) == sizeof(struct rwindow)); diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c index 06772ea20812..8a6f75d2f386 100644 --- a/sys/sparc64/sparc64/trap.c +++ b/sys/sparc64/sparc64/trap.c @@ -61,7 +61,6 @@ #include <sys/syscall.h> #include <sys/sysctl.h> #include <sys/sysent.h> -#include <sys/user.h> #include <sys/vmmeter.h> #ifdef KTRACE #include <sys/uio.h> diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c index 5e96292b0ec4..7f26525b08ed 100644 --- a/sys/sparc64/sparc64/vm_machdep.c +++ b/sys/sparc64/sparc64/vm_machdep.c @@ -58,7 +58,6 @@ #include <sys/sf_buf.h> #include <sys/sysctl.h> #include <sys/unistd.h> -#include <sys/user.h> #include <sys/vmmeter.h> #include <dev/ofw/openfirm.h> @@ -83,6 +82,7 @@ #include <machine/md_var.h> #include <machine/ofw_machdep.h> #include <machine/ofw_mem.h> +#include <machine/pcb.h> #include <machine/tlb.h> #include <machine/tstate.h> diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 96ef04033c5a..7e923aa96149 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -91,8 +91,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_pager.h> #include <vm/swap_pager.h> -#include <sys/user.h> - extern int maxslp; /* diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c index 5b8b64d11c89..01d7b43a3fcb 100644 --- a/usr.bin/ktrace/subr.c +++ b/usr.bin/ktrace/subr.c @@ -42,9 +42,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/file.h> -#include <sys/user.h> #include <sys/proc.h> #include <sys/time.h> +#include <sys/uio.h> #include <sys/ktrace.h> #include <stdio.h> diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index 0d25894629be..9e22a3aa52e8 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -58,10 +58,11 @@ __FBSDID("$FreeBSD$"); #include <sys/tty.h> #include <sys/blist.h> -#include <sys/user.h> #include <sys/sysctl.h> +#include <vm/vm_param.h> #include <err.h> +#include <errno.h> #include <fcntl.h> #include <kvm.h> #include <limits.h> |