diff options
Diffstat (limited to 'sys')
163 files changed, 742 insertions, 241 deletions
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c index 469364c..690600f 100644 --- a/sys/amd64/amd64/db_disasm.c +++ b/sys/amd64/amd64/db_disasm.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_disasm.c,v 1.10 1995/10/29 15:29:48 phk Exp $ + * $Id: db_disasm.c,v 1.11 1995/10/30 17:13:25 bde Exp $ */ /* @@ -32,6 +32,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_access.h> diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c index 2f458a8..7536c1c 100644 --- a/sys/amd64/amd64/db_interface.c +++ b/sys/amd64/amd64/db_interface.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_interface.c,v 1.14 1995/05/30 07:59:22 rgrimes Exp $ + * $Id: db_interface.c,v 1.15 1995/11/18 06:49:35 bde Exp $ */ /* @@ -40,10 +40,11 @@ #include <machine/cons.h> /* XXX: import cons_unavail */ -#include <ddb/ddb.h> - +#include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/pmap.h> +#include <ddb/ddb.h> #include <setjmp.h> int db_active = 0; diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 2d47b84..b0c77b0 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $Id: genassym.c,v 1.28 1995/08/17 11:29:55 davidg Exp $ + * $Id: genassym.c,v 1.29 1995/12/03 18:35:17 bde Exp $ */ #include <stdio.h> @@ -57,7 +57,12 @@ #include <machine/reg.h> #include <machine/bootinfo.h> #include <sys/syscall.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <sys/user.h> #include <net/if.h> #include <netinet/in.h> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 6520a16..4717cc7 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.153 1995/11/29 19:57:01 wollman Exp $ + * $Id: machdep.c,v 1.154 1995/12/04 16:47:40 phk Exp $ */ #include "npx.h" @@ -47,7 +47,6 @@ #include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/buf.h> #include <sys/reboot.h> #include <sys/conf.h> @@ -62,6 +61,7 @@ #include <sys/tty.h> #include <sys/sysctl.h> #include <sys/devconf.h> +#include <sys/vmmeter.h> #ifdef SYSVSHM #include <sys/shm.h> @@ -76,10 +76,17 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/vm_kern.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> #include <vm/vm_pager.h> +#include <vm/vm_extern.h> +#include <sys/user.h> #include <sys/exec.h> #include <sys/vnode.h> diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index a444ed6..5fb364e 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.20 1995/11/29 10:47:18 julian Exp $ + * $Id: mem.c,v 1.21 1995/11/29 14:39:26 julian Exp $ */ /* @@ -62,6 +62,7 @@ #include <vm/lock.h> #include <vm/vm_prot.h> #include <vm/pmap.h> +#include <vm/vm_extern.h> #ifdef JREMOD #include <sys/kernel.h> diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 3ef2d87..e89ef2d 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.65 1995/11/20 12:10:01 phk Exp $ + * $Id: pmap.c,v 1.66 1995/12/03 18:35:28 bde Exp $ */ /* @@ -89,13 +89,20 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/malloc.h> -#include <sys/user.h> #include <sys/msgbuf.h> +#include <sys/queue.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/vm_kern.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> +#include <machine/pcb.h> #include <machine/cputypes.h> #include <machine/md_var.h> diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index ca6dcc9..686d33d 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $Id$ + * $Id: sys_machdep.c,v 1.11 1995/11/12 07:10:47 bde Exp $ * */ @@ -39,6 +39,15 @@ #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/proc.h> + +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_extern.h> + #include <sys/user.h> #include <machine/cpu.h> diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 1b92567..5c8a647 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.61 1995/10/09 04:36:01 bde Exp $ + * $Id: trap.c,v 1.62 1995/10/28 15:38:32 phk Exp $ */ /* @@ -45,20 +45,27 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/acct.h> #include <sys/kernel.h> #include <sys/syscall.h> #include <sys/sysent.h> +#include <sys/queue.h> +#include <sys/vmmeter.h> #ifdef KTRACE #include <sys/ktrace.h> #endif +#include <vm/vm.h> #include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/pmap.h> #include <vm/vm_kern.h> #include <vm/vm_map.h> #include <vm/vm_page.h> +#include <vm/vm_extern.h> + +#include <sys/user.h> #include <machine/cpu.h> #include <machine/md_var.h> diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 6e2a520..9779f11 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.44 1995/11/18 06:54:11 bde Exp $ + * $Id: vm_machdep.c,v 1.45 1995/11/20 12:10:09 phk Exp $ */ #include "npx.h" @@ -48,15 +48,22 @@ #include <sys/malloc.h> #include <sys/buf.h> #include <sys/vnode.h> -#include <sys/user.h> +#include <sys/vmmeter.h> #include <machine/clock.h> #include <machine/cpu.h> #include <machine/md_var.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/vm_kern.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> +#include <vm/vm_extern.h> + +#include <sys/user.h> #include <i386/isa/isa.h> diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 503d0d4..e04a500 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.56 1995/11/20 12:41:44 phk Exp $ + * $Id: isa.c,v 1.57 1995/11/20 13:24:18 bde Exp $ */ /* @@ -61,6 +61,8 @@ #include <sys/rlist.h> #include <machine/segments.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <machine/spl.h> #include <machine/cpu.h> #include <i386/isa/isa_device.h> diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c index c7860d1..29ac431 100644 --- a/sys/ddb/db_access.c +++ b/sys/ddb/db_access.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_access.c,v 1.8 1995/11/24 14:13:29 bde Exp $ + * $Id: db_access.c,v 1.9 1995/11/29 10:25:03 phk Exp $ */ /* @@ -33,6 +33,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_access.h> diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c index edf811d..f617ea5 100644 --- a/sys/ddb/db_aout.c +++ b/sys/ddb/db_aout.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_aout.c,v 1.12 1995/11/24 14:13:30 bde Exp $ + * $Id: db_aout.c,v 1.13 1995/11/29 10:25:06 phk Exp $ */ /* @@ -37,6 +37,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <machine/bootinfo.h> diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index 89000a1..2887b45 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_break.c,v 1.7 1995/11/24 14:13:31 bde Exp $ + * $Id: db_break.c,v 1.8 1995/11/29 10:25:09 phk Exp $ */ /* @@ -36,6 +36,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_lex.h> diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h index 51eec48..5ea5996 100644 --- a/sys/ddb/db_break.h +++ b/sys/ddb/db_break.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_break.h,v 1.4 1995/11/24 13:52:57 bde Exp $ + * $Id: db_break.h,v 1.5 1995/11/29 10:25:11 phk Exp $ */ /* @@ -33,7 +33,6 @@ #ifndef _DDB_DB_BREAK_H_ #define _DDB_DB_BREAK_H_ -#include <vm/vm_map.h> #include <machine/db_machdep.h> /* diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 26147e1..9ad1732 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_command.c,v 1.15 1995/11/24 14:13:32 bde Exp $ + * $Id: db_command.c,v 1.16 1995/11/29 10:25:14 phk Exp $ */ /* @@ -37,6 +37,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <ddb/ddb.h> #include <ddb/db_command.h> diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c index 46fc66d..52941a1 100644 --- a/sys/ddb/db_examine.c +++ b/sys/ddb/db_examine.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_examine.c,v 1.9 1995/11/24 14:13:33 bde Exp $ + * $Id: db_examine.c,v 1.10 1995/11/29 10:25:17 phk Exp $ */ /* @@ -33,6 +33,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c index 4a919c2..ead501e 100644 --- a/sys/ddb/db_expr.c +++ b/sys/ddb/db_expr.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_expr.c,v 1.6 1995/11/24 14:13:34 bde Exp $ + * $Id: db_expr.c,v 1.7 1995/11/29 10:25:18 phk Exp $ */ /* @@ -33,6 +33,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_lex.h> #include <ddb/db_access.h> diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index 25a7e8b..c7b4470 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_input.c,v 1.8 1995/11/24 14:13:36 bde Exp $ + * $Id: db_input.c,v 1.9 1995/11/29 10:25:21 phk Exp $ */ /* @@ -34,6 +34,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_output.h> #include <machine/cons.h> diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c index 36abdd2..38f95a5 100644 --- a/sys/ddb/db_lex.c +++ b/sys/ddb/db_lex.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_lex.c,v 1.7 1995/11/24 14:13:37 bde Exp $ + * $Id: db_lex.c,v 1.8 1995/11/29 10:25:23 phk Exp $ */ /* @@ -35,6 +35,7 @@ */ #include <sys/param.h> #include <sys/systm.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_lex.h> diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index c512092..889c3e3 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_output.c,v 1.12 1995/11/24 14:13:38 bde Exp $ + * $Id: db_output.c,v 1.13 1995/11/29 10:25:29 phk Exp $ */ /* @@ -37,6 +37,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <vm/vm_param.h> #include <machine/stdarg.h> #include <ddb/ddb.h> #include <ddb/db_output.h> diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c index 91c43f3..0dd550e 100644 --- a/sys/ddb/db_print.c +++ b/sys/ddb/db_print.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_print.c,v 1.7 1995/05/30 07:57:06 rgrimes Exp $ + * $Id: db_print.c,v 1.8 1995/11/24 14:13:39 bde Exp $ */ /* @@ -37,6 +37,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c index 9e203a4..fa3165f 100644 --- a/sys/ddb/db_ps.c +++ b/sys/ddb/db_ps.c @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: db_ps.c,v 1.7 1995/08/20 05:25:11 davidg Exp $ + * $Id: db_ps.c,v 1.8 1995/08/27 02:40:39 bde Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <machine/cons.h> diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c index dc0e2ab..86b83d2 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_run.c,v 1.6 1995/11/24 14:13:40 bde Exp $ + * $Id: db_run.c,v 1.7 1995/11/29 10:25:31 phk Exp $ */ /* @@ -37,6 +37,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_lex.h> diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index 02e5383..61f8cbe5 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_sym.c,v 1.10 1995/11/24 14:13:41 bde Exp $ + * $Id: db_sym.c,v 1.11 1995/11/29 10:25:35 phk Exp $ */ /* @@ -33,6 +33,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_sym.h> diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c index 83419b8..904fff2 100644 --- a/sys/ddb/db_trap.c +++ b/sys/ddb/db_trap.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trap.c,v 1.6 1994/10/02 19:36:21 phk Exp $ + * $Id: db_trap.c,v 1.7 1995/05/30 07:57:14 rgrimes Exp $ */ /* @@ -37,6 +37,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_command.h> #include <ddb/db_break.h> diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c index 041c49e..576d895 100644 --- a/sys/ddb/db_variables.c +++ b/sys/ddb/db_variables.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_variables.c,v 1.8 1995/11/24 14:13:41 bde Exp $ + * $Id: db_variables.c,v 1.9 1995/11/29 10:25:41 phk Exp $ */ /* @@ -34,6 +34,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_lex.h> diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index 740d2e8..4cec857 100644 --- a/sys/ddb/db_watch.c +++ b/sys/ddb/db_watch.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_watch.c,v 1.7 1995/11/24 14:13:42 bde Exp $ + * $Id: db_watch.c,v 1.8 1995/11/29 10:25:44 phk Exp $ */ /* @@ -34,9 +34,14 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/lock.h> +#include <vm/vm_prot.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <ddb/ddb.h> -#include <vm/vm_map.h> #include <ddb/db_lex.h> #include <ddb/db_watch.h> #include <ddb/db_access.h> diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h index f6a3983..e4a417d 100644 --- a/sys/ddb/db_watch.h +++ b/sys/ddb/db_watch.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_watch.h,v 1.5 1995/11/24 13:53:03 bde Exp $ + * $Id: db_watch.h,v 1.6 1995/11/29 10:25:47 phk Exp $ */ /* @@ -34,7 +34,6 @@ #ifndef _DDB_DB_WATCH_H_ #define _DDB_DB_WATCH_H_ -#include <vm/vm_map.h> #include <machine/db_machdep.h> /* diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c index 1b2a99e..e4c9eb0 100644 --- a/sys/ddb/db_write_cmd.c +++ b/sys/ddb/db_write_cmd.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_write_cmd.c,v 1.4 1994/08/13 03:49:26 wollman Exp $ + * $Id: db_write_cmd.c,v 1.5 1995/05/30 07:57:23 rgrimes Exp $ */ /* @@ -34,6 +34,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_lex.h> diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h index fc57f1e..e270b93 100644 --- a/sys/ddb/ddb.h +++ b/sys/ddb/ddb.h @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ddb.h,v 1.7 1995/11/24 13:53:05 bde Exp $ + * $Id: ddb.h,v 1.8 1995/11/29 10:25:50 phk Exp $ */ /* @@ -38,7 +38,6 @@ #define _DDB_DDB_H_ #include <machine/db_machdep.h> /* type definitions */ -#include <vm/vm.h> typedef void db_cmdfcn_t __P((db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif)); diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index a44cbf2..5d9dbd3 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.37 1995/11/17 12:11:22 davidg Exp $ + * $Id: if_de.c,v 1.38 1995/11/29 11:19:02 asami Exp $ * */ @@ -82,8 +82,9 @@ #endif #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_param.h> +#include <vm/pmap.h> +#include <vm/vm_kern.h> #if defined(__FreeBSD__) #include <pci.h> diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index fb46e28..68499f8 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.7 1995/11/29 14:39:06 julian Exp $ + * dgb.c $Id: dgb.c,v 1.8 1995/12/06 23:52:08 bde Exp $ * * Digiboard driver. * @@ -44,6 +44,8 @@ #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 95a937c..844590e 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.3 1995/12/05 02:01:51 davidg Exp $ + * $Id: if_fxp.c,v 1.4 1995/12/05 11:49:49 davidg Exp $ */ /* @@ -76,7 +76,7 @@ #include <vm/vm.h> /* for vtophys */ #include <vm/vm_param.h> /* for vtophys */ -#include <machine/pmap.h> /* for vtophys */ +#include <vm/pmap.h> /* for vtophys */ #include <machine/clock.h> /* for DELAY */ #include <pci/pcivar.h> diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 13d53cc..c80da37 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci.c,v 1.34 1995/11/21 13:59:56 bde Exp $ +** $Id: pci.c,v 1.35 1995/12/06 15:52:23 se Exp $ ** ** General subroutines for the PCI bus. ** pci_configure () @@ -59,8 +59,8 @@ #include <vm/vm.h> #include <vm/vm_param.h> +#include <vm/pmap.h> -#include <machine/pmap.h> #include <sys/devconf.h> #include <i386/isa/isa_device.h> /* XXX inthand2_t */ diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 5e35245..1b732d9 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.20 1995/12/04 17:33:45 peter Exp $ + * $Id: si.c,v 1.21 1995/12/06 23:50:27 bde Exp $ */ #ifndef lint @@ -57,6 +57,8 @@ static char si_copyright1[] = "@(#) (C) Specialix International, 1990,1992", #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/icu.h> #include <i386/isa/isa.h> diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index a1c2796..6c736ca 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.132 1995/11/30 03:29:31 ache Exp $ + * $Id: syscons.c,v 1.133 1995/12/06 23:50:36 bde Exp $ */ #include "sc.h" @@ -56,6 +56,8 @@ #include <machine/random.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index b405705..9f71630 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_denode.c,v 1.13 1995/08/02 12:59:48 dfr Exp $ */ +/* $Id: msdosfs_denode.c,v 1.14 1995/12/03 16:41:53 bde Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */ /*- @@ -59,6 +59,8 @@ #include <sys/kernel.h> /* defines "time" */ #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <msdosfs/bpb.h> #include <msdosfs/msdosfsmount.h> diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index b0d5cc7..899d9f8 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.28 1995/11/13 18:47:40 bde Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.29 1995/12/03 16:42:02 bde Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- @@ -65,6 +65,8 @@ #include <sys/signalvar.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <msdosfs/bpb.h> #include <msdosfs/direntry.h> diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c index 700b619..d11a296 100644 --- a/sys/fs/procfs/procfs_ctl.c +++ b/sys/fs/procfs/procfs_ctl.c @@ -36,7 +36,7 @@ * * @(#)procfs_ctl.c 8.3 (Berkeley) 1/21/94 * - * $Id: procfs_ctl.c,v 1.6 1995/07/16 10:12:50 bde Exp $ + * $Id: procfs_ctl.c,v 1.7 1995/12/03 14:54:34 bde Exp $ */ #include <sys/param.h> @@ -53,6 +53,8 @@ #include <sys/signalvar.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <miscfs/procfs/procfs.h> diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index c75665a..d24cbbf 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -37,7 +37,7 @@ * * @(#)procfs_mem.c 8.4 (Berkeley) 1/21/94 * - * $Id: procfs_mem.c,v 1.10 1995/10/23 04:28:59 dyson Exp $ + * $Id: procfs_mem.c,v 1.11 1995/12/03 14:54:35 bde Exp $ */ /* @@ -53,8 +53,15 @@ #include <sys/vnode.h> #include <miscfs/procfs/procfs.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/vm_kern.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> +#include <vm/vm_extern.h> static int procfs_rwmem __P((struct proc *p, struct uio *uio)); diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index ae51350..38e694e 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.6 (Berkeley) 4/9/94 - * $Id: spec_vnops.c,v 1.19 1995/11/29 12:38:49 julian Exp $ + * $Id: spec_vnops.c,v 1.20 1995/12/05 21:51:45 bde Exp $ */ #include <sys/param.h> @@ -48,8 +48,12 @@ #include <sys/ioctl.h> #include <sys/file.h> #include <sys/disklabel.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> #include <vm/vnode_pager.h> diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index fb46e28..68499f8 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.7 1995/11/29 14:39:06 julian Exp $ + * dgb.c $Id: dgb.c,v 1.8 1995/12/06 23:52:08 bde Exp $ * * Digiboard driver. * @@ -44,6 +44,8 @@ #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index d1167dd..eee873d 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -13,7 +13,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.17 1995/11/29 10:47:13 julian Exp $ + * $Id: apm.c,v 1.18 1995/11/29 14:39:17 julian Exp $ */ #include "apm.h" @@ -43,6 +43,8 @@ #include <machine/segments.h> #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <sys/syslog.h> #include "apm_setup.h" #endif /* __FreeBSD__ */ diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index d1167dd..eee873d 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -13,7 +13,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.17 1995/11/29 10:47:13 julian Exp $ + * $Id: apm.c,v 1.18 1995/11/29 14:39:17 julian Exp $ */ #include "apm.h" @@ -43,6 +43,8 @@ #include <machine/segments.h> #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <sys/syslog.h> #include "apm_setup.h" #endif /* __FreeBSD__ */ diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index a61b909..583735e 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.41 1995/11/29 10:12:28 phk Exp $ + * $Id: aha1742.c,v 1.42 1995/12/06 23:52:35 bde Exp $ */ #include <sys/types.h> @@ -32,6 +32,8 @@ #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/eisa/eisaconf.h> #else diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index 318f50b..e65ce87 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.110 1995/12/05 20:33:57 bde Exp $ + * $Id: conf.c,v 1.111 1995/12/06 22:31:54 bde Exp $ */ #include <sys/param.h> @@ -55,6 +55,8 @@ #include <sys/conf.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #ifdef JREMOD diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c index 469364c..690600f 100644 --- a/sys/i386/i386/db_disasm.c +++ b/sys/i386/i386/db_disasm.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_disasm.c,v 1.10 1995/10/29 15:29:48 phk Exp $ + * $Id: db_disasm.c,v 1.11 1995/10/30 17:13:25 bde Exp $ */ /* @@ -32,6 +32,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <vm/vm.h> +#include <vm/vm_param.h> #include <ddb/ddb.h> #include <ddb/db_access.h> diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index 2f458a8..7536c1c 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_interface.c,v 1.14 1995/05/30 07:59:22 rgrimes Exp $ + * $Id: db_interface.c,v 1.15 1995/11/18 06:49:35 bde Exp $ */ /* @@ -40,10 +40,11 @@ #include <machine/cons.h> /* XXX: import cons_unavail */ -#include <ddb/ddb.h> - +#include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/pmap.h> +#include <ddb/ddb.h> #include <setjmp.h> int db_active = 0; diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index 2d47b84..b0c77b0 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $Id: genassym.c,v 1.28 1995/08/17 11:29:55 davidg Exp $ + * $Id: genassym.c,v 1.29 1995/12/03 18:35:17 bde Exp $ */ #include <stdio.h> @@ -57,7 +57,12 @@ #include <machine/reg.h> #include <machine/bootinfo.h> #include <sys/syscall.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <sys/user.h> #include <net/if.h> #include <netinet/in.h> diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 6520a16..4717cc7 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.153 1995/11/29 19:57:01 wollman Exp $ + * $Id: machdep.c,v 1.154 1995/12/04 16:47:40 phk Exp $ */ #include "npx.h" @@ -47,7 +47,6 @@ #include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/buf.h> #include <sys/reboot.h> #include <sys/conf.h> @@ -62,6 +61,7 @@ #include <sys/tty.h> #include <sys/sysctl.h> #include <sys/devconf.h> +#include <sys/vmmeter.h> #ifdef SYSVSHM #include <sys/shm.h> @@ -76,10 +76,17 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/vm_kern.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> #include <vm/vm_pager.h> +#include <vm/vm_extern.h> +#include <sys/user.h> #include <sys/exec.h> #include <sys/vnode.h> diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c index f995d0c..8051bb8 100644 --- a/sys/i386/i386/math_emulate.c +++ b/sys/i386/i386/math_emulate.c @@ -6,7 +6,7 @@ * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj] * * from: 386BSD 0.1 - * $Id: math_emulate.c,v 1.13 1995/06/14 05:06:51 bde Exp $ + * $Id: math_emulate.c,v 1.14 1995/10/29 15:29:56 phk Exp $ */ /* @@ -43,11 +43,18 @@ #include <machine/reg.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/acct.h> #include <sys/kernel.h> #include <sys/signal.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <sys/user.h> + #define __ALIGNED_TEMP_REAL 1 #include "math_emu.h" diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index a444ed6..5fb364e 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.20 1995/11/29 10:47:18 julian Exp $ + * $Id: mem.c,v 1.21 1995/11/29 14:39:26 julian Exp $ */ /* @@ -62,6 +62,7 @@ #include <vm/lock.h> #include <vm/vm_prot.h> #include <vm/pmap.h> +#include <vm/vm_extern.h> #ifdef JREMOD #include <sys/kernel.h> diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 3ef2d87..e89ef2d 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.65 1995/11/20 12:10:01 phk Exp $ + * $Id: pmap.c,v 1.66 1995/12/03 18:35:28 bde Exp $ */ /* @@ -89,13 +89,20 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/malloc.h> -#include <sys/user.h> #include <sys/msgbuf.h> +#include <sys/queue.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/vm_kern.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> +#include <machine/pcb.h> #include <machine/cputypes.h> #include <machine/md_var.h> diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c index 1b51d06..1c88a55 100644 --- a/sys/i386/i386/procfs_machdep.c +++ b/sys/i386/i386/procfs_machdep.c @@ -37,7 +37,7 @@ * @(#)procfs_machdep.c 8.3 (Berkeley) 1/27/94 * * From: - * $Id: procfs_machdep.c,v 1.3 1995/01/14 13:20:09 bde Exp $ + * $Id: procfs_machdep.c,v 1.4 1995/03/16 18:11:29 bde Exp $ */ /* @@ -72,7 +72,6 @@ #include <sys/kernel.h> #include <sys/proc.h> #include <sys/ptrace.h> -#include <sys/user.h> #include <sys/vnode.h> #include <machine/psl.h> #include <machine/reg.h> @@ -80,6 +79,15 @@ #include <machine/md_var.h> #include <miscfs/procfs/procfs.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> + +#include <sys/user.h> + int procfs_read_regs(p, regs) struct proc *p; diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index ca6dcc9..686d33d 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $Id$ + * $Id: sys_machdep.c,v 1.11 1995/11/12 07:10:47 bde Exp $ * */ @@ -39,6 +39,15 @@ #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/proc.h> + +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_extern.h> + #include <sys/user.h> #include <machine/cpu.h> diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 1b92567..5c8a647 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.61 1995/10/09 04:36:01 bde Exp $ + * $Id: trap.c,v 1.62 1995/10/28 15:38:32 phk Exp $ */ /* @@ -45,20 +45,27 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/acct.h> #include <sys/kernel.h> #include <sys/syscall.h> #include <sys/sysent.h> +#include <sys/queue.h> +#include <sys/vmmeter.h> #ifdef KTRACE #include <sys/ktrace.h> #endif +#include <vm/vm.h> #include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/pmap.h> #include <vm/vm_kern.h> #include <vm/vm_map.h> #include <vm/vm_page.h> +#include <vm/vm_extern.h> + +#include <sys/user.h> #include <machine/cpu.h> #include <machine/md_var.h> diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 6e2a520..9779f11 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.44 1995/11/18 06:54:11 bde Exp $ + * $Id: vm_machdep.c,v 1.45 1995/11/20 12:10:09 phk Exp $ */ #include "npx.h" @@ -48,15 +48,22 @@ #include <sys/malloc.h> #include <sys/buf.h> #include <sys/vnode.h> -#include <sys/user.h> +#include <sys/vmmeter.h> #include <machine/clock.h> #include <machine/cpu.h> #include <machine/md_var.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/vm_kern.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> +#include <vm/vm_extern.h> + +#include <sys/user.h> #include <i386/isa/isa.h> diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c index 0b6f596..ae81a2d 100644 --- a/sys/i386/ibcs2/ibcs2_isc.c +++ b/sys/i386/ibcs2/ibcs2_isc.c @@ -27,12 +27,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_isc.c,v 1.4 1995/05/30 07:59:58 rgrimes Exp $ + * $Id: ibcs2_isc.c,v 1.5 1995/10/10 07:58:52 swallace Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/sysent.h> +#include <sys/proc.h> #include <machine/cpu.h> #include <machine/psl.h> diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c index 8708fc6..1614a0d 100644 --- a/sys/i386/ibcs2/ibcs2_other.c +++ b/sys/i386/ibcs2/ibcs2_other.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: ibcs2_other.c,v 1.2 1995/10/16 05:52:55 swallace Exp $ */ /* @@ -30,6 +30,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/sysproto.h> #include <sys/kernel.h> diff --git a/sys/i386/ibcs2/ibcs2_util.h b/sys/i386/ibcs2/ibcs2_util.h index 124a411..17594bb 100644 --- a/sys/i386/ibcs2/ibcs2_util.h +++ b/sys/i386/ibcs2/ibcs2_util.h @@ -41,6 +41,7 @@ #include <vm/vm.h> #include <vm/vm_param.h> +#include <vm/pmap.h> #include <machine/vmparam.h> #include <sys/exec.h> #include <sys/cdefs.h> diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index 170c2fa..c71ff50 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_coff.c,v 1.9 1995/10/10 17:33:19 swallace Exp $ + * $Id: imgact_coff.c,v 1.10 1995/11/06 12:52:14 davidg Exp $ */ #include <sys/param.h> @@ -40,8 +40,15 @@ #include <sys/malloc.h> #include <sys/mount.h> #include <sys/sysent.h> + #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> #include <i386/ibcs2/coff.h> #include <i386/ibcs2/ibcs2_util.h> diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index 9230a68..9f79dd6 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.50 1995/11/04 17:07:00 bde Exp $ + * $Id: aha1542.c,v 1.51 1995/12/06 23:50:45 bde Exp $ */ /* @@ -35,6 +35,8 @@ #include <machine/cpu.h> /* XXX for bootverbose: a funny place */ #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa_device.h> #endif /* KERNEL */ diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c index a092cea..329ab87 100644 --- a/sys/i386/isa/bt742a.c +++ b/sys/i386/isa/bt742a.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: bt742a.c,v 1.44 1995/12/06 23:50:06 bde Exp $ + * $Id: bt742a.c,v 1.45 1995/12/07 09:13:48 peter Exp $ */ /* @@ -50,6 +50,8 @@ #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa_device.h> #include <scsi/scsi_all.h> diff --git a/sys/i386/isa/cronyx.c b/sys/i386/isa/cronyx.c index c782557..c5ed8f4 100644 --- a/sys/i386/isa/cronyx.c +++ b/sys/i386/isa/cronyx.c @@ -30,6 +30,8 @@ # include <sys/socket.h> # include <net/if.h> # include <vm/vm.h> +# include <vm/vm_param.h> +# include <vm/pmap.h> # ifndef __FreeBSD__ # include <machine/inline.h> # endif diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c index 2e38218..241f47c 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_le.c,v 1.23 1995/11/04 17:07:33 bde Exp $ + * $Id: if_le.c,v 1.24 1995/12/05 02:01:13 davidg Exp $ */ /* @@ -82,6 +82,8 @@ #include <i386/isa/icu.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #if NBPFILTER > 0 #include <net/bpf.h> diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 503d0d4..e04a500 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.56 1995/11/20 12:41:44 phk Exp $ + * $Id: isa.c,v 1.57 1995/11/20 13:24:18 bde Exp $ */ /* @@ -61,6 +61,8 @@ #include <sys/rlist.h> #include <machine/segments.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <machine/spl.h> #include <machine/cpu.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c index 3c5c0f4..3c0b4b4 100644 --- a/sys/i386/isa/lpt.c +++ b/sys/i386/isa/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.43 1995/12/02 20:33:40 phk Exp $ + * $Id: lpt.c,v 1.44 1995/12/06 23:50:14 bde Exp $ */ /* @@ -118,6 +118,8 @@ #include <machine/lpt.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index 65aa098..57848cc 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -169,6 +169,9 @@ #include <machine/clock.h> #include <machine/md_var.h> #endif +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #else /* PCVT_FREEBSD >= 200 */ #include "machine/pc/display.h" #endif /* PCVT_FREEBSD >= 200 */ diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c index eaf6142..76a5215 100644 --- a/sys/i386/isa/seagate.c +++ b/sys/i386/isa/seagate.c @@ -60,7 +60,7 @@ * that category, with the possible exception of scanners and * some of the older MO drives. * - * $Id: seagate.c,v 1.12 1995/11/04 17:07:44 bde Exp $ + * $Id: seagate.c,v 1.13 1995/12/06 23:50:20 bde Exp $ */ /* @@ -126,6 +126,8 @@ #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index 5e35245..1b732d9 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.20 1995/12/04 17:33:45 peter Exp $ + * $Id: si.c,v 1.21 1995/12/06 23:50:27 bde Exp $ */ #ifndef lint @@ -57,6 +57,8 @@ static char si_copyright1[] = "@(#) (C) Specialix International, 1990,1992", #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/icu.h> #include <i386/isa/isa.h> diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h index ad5b98e..69c641e 100644 --- a/sys/i386/isa/sound/os.h +++ b/sys/i386/isa/sound/os.h @@ -32,6 +32,9 @@ #include <sys/buf.h> #include <i386/isa/isa_device.h> #include <machine/cpufunc.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> /* These few lines are used by 386BSD (only??). */ diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index a1c2796..6c736ca 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.132 1995/11/30 03:29:31 ache Exp $ + * $Id: syscons.c,v 1.133 1995/12/06 23:50:36 bde Exp $ */ #include "sc.h" @@ -56,6 +56,8 @@ #include <machine/random.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index 15d665f..ca7b7e2 100644 --- a/sys/i386/isa/ultra14f.c +++ b/sys/i386/isa/ultra14f.c @@ -22,7 +22,7 @@ * today: Fri Jun 2 17:21:03 EST 1994 * added 24F support ++sg * - * $Id: ultra14f.c,v 1.39 1995/11/14 09:53:17 phk Exp $ + * $Id: ultra14f.c,v 1.40 1995/12/06 23:50:39 bde Exp $ */ #include <sys/types.h> @@ -42,6 +42,8 @@ #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa_device.h> #endif /*KERNEL */ diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index af05ceb..354b0bb 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.94 1995/11/29 10:48:01 julian Exp $ + * $Id: wd.c,v 1.95 1995/11/29 14:40:08 julian Exp $ */ /* TODO: @@ -88,6 +88,9 @@ #include <sys/syslog.h> #include <sys/dkstat.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/pmap.h> #ifdef ATAPI #include <i386/isa/atapi.h> diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c index dea8262..b716d54 100644 --- a/sys/i386/isa/wd7000.c +++ b/sys/i386/isa/wd7000.c @@ -68,6 +68,8 @@ #include <machine/cpu.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c index 9f92e8f..781aad6 100644 --- a/sys/i386/scsi/aic7xxx.c +++ b/sys/i386/scsi/aic7xxx.c @@ -24,7 +24,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aic7xxx.c,v 1.47 1995/11/07 07:01:05 gibbs Exp $ + * $Id: aic7xxx.c,v 1.48 1995/12/06 23:51:37 bde Exp $ */ /* * TODO: @@ -45,6 +45,8 @@ #include <machine/clock.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/scsi/aic7xxx.h> #include <i386/scsi/93cx6.h> diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index a1c2796..6c736ca 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.132 1995/11/30 03:29:31 ache Exp $ + * $Id: syscons.c,v 1.133 1995/12/06 23:50:36 bde Exp $ */ #include "sc.h" @@ -56,6 +56,8 @@ #include <machine/random.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 7d3fea5..2619bbe 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_aout.c,v 1.17 1995/11/06 12:52:29 davidg Exp $ + * $Id: imgact_aout.c,v 1.18 1995/12/02 16:31:59 bde Exp $ */ #include <sys/param.h> @@ -42,6 +42,12 @@ #include <sys/sysent.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_extern.h> static int exec_aout_imgact __P((struct image_params *imgp)); diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index 792f8d6..4fa24ef 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: imgact_gzip.c,v 1.15 1995/11/06 12:52:30 davidg Exp $ + * $Id: imgact_gzip.c,v 1.16 1995/12/02 16:32:01 bde Exp $ * * This module handles execution of a.out files which have been run through * "gzip". This saves diskspace, but wastes cpu-cycles and VM. @@ -33,7 +33,13 @@ #include <sys/inflate.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> struct imgact_gzip { struct image_params *ip; diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 777baba..a2348d2 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $Id: init_main.c,v 1.33 1995/12/02 17:10:29 bde Exp $ + * $Id: init_main.c,v 1.34 1995/12/04 16:48:18 phk Exp $ */ #include <sys/param.h> @@ -66,15 +66,21 @@ #include <sys/reboot.h> #include <sys/sem.h> #include <sys/shm.h> -#include <sys/user.h> #include <sys/sysproto.h> +#include <sys/vmmeter.h> #include <ufs/ufs/quota.h> #include <machine/cpu.h> #include <vm/vm.h> -#include <vm/vm_pageout.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_extern.h> +#include <sys/user.h> extern struct linker_set sysinit_set; /* XXX */ diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 77cdc09..a662efc 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.21 1995/12/04 16:48:20 phk Exp $ + * $Id: kern_clock.c,v 1.22 1995/12/06 13:27:37 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -66,6 +66,11 @@ #include <sys/signalvar.h> #include <sys/timex.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <sys/sysctl.h> #include <machine/cpu.h> diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index c98b6f4..cc3ec92 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.18 1995/12/04 16:48:24 phk Exp $ + * $Id: kern_descrip.c,v 1.19 1995/12/05 21:51:28 bde Exp $ */ #include <sys/param.h> @@ -59,6 +59,8 @@ #include <sys/resourcevar.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #ifdef JREMOD #include <sys/conf.h> diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 24a219c..2b01960 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_exec.c,v 1.26 1995/11/12 06:42:53 bde Exp $ + * $Id: kern_exec.c,v 1.27 1995/11/13 10:45:22 davidg Exp $ */ #include <sys/param.h> @@ -49,7 +49,13 @@ #include <sys/shm.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> #include <machine/reg.h> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index d296f1c..0f46758 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $Id: kern_exit.c,v 1.19 1995/10/23 19:44:38 swallace Exp $ + * $Id: kern_exit.c,v 1.20 1995/11/11 05:49:22 bde Exp $ */ #include <sys/param.h> @@ -68,6 +68,11 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/vm_kern.h> static int wait1 __P((struct proc *, struct wait_args *, int [], int)); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 285cb6f..037fd01 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $Id: kern_fork.c,v 1.13 1995/10/08 00:06:05 swallace Exp $ + * $Id: kern_fork.c,v 1.14 1995/11/12 06:42:54 bde Exp $ */ #include <sys/param.h> @@ -53,6 +53,8 @@ #include <sys/ktrace.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> static int fork1(struct proc *, int, int *); diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index 9b2c46e..bcebe68 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_lkm.c,v 1.21 1995/11/29 14:40:34 julian Exp $ + * $Id: kern_lkm.c,v 1.22 1995/11/29 17:45:59 wollman Exp $ */ #include <sys/param.h> @@ -53,6 +53,7 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> #ifdef JREMOD #ifdef DEVFS diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index f317006..900b2c7 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.14 1995/09/09 18:10:03 davidg Exp $ + * $Id: kern_malloc.c,v 1.15 1995/12/02 17:10:34 bde Exp $ */ #include <sys/param.h> @@ -39,9 +39,12 @@ #include <sys/proc.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> static void kmeminit __P((void *)); SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL) diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index 47e0e7b..36f1c14 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: kern_physio.c,v 1.13 1995/11/28 02:40:38 peter Exp $ + * $Id: kern_physio.c,v 1.14 1995/12/02 18:58:48 bde Exp $ */ #include <sys/param.h> @@ -25,6 +25,8 @@ #include <sys/conf.h> #include <sys/proc.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> static void physwakeup __P((struct buf *bp)); diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 0b2343b..03f921f 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -31,14 +31,13 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.4 (Berkeley) 1/4/94 - * $Id: kern_proc.c,v 1.11 1995/11/14 09:16:27 phk Exp $ + * $Id: kern_proc.c,v 1.12 1995/12/02 18:58:49 bde Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <sys/user.h> #include <sys/proc.h> #include <sys/buf.h> #include <sys/acct.h> @@ -51,6 +50,13 @@ #include <sys/ioctl.h> #include <sys/tty.h> #include <sys/signalvar.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <sys/user.h> struct prochd qs[NQS]; /* as good a place as any... */ struct prochd rtqs[NQS]; /* Space for REALTIME queues too */ diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index b604513..eb6633d 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_resource.c,v 1.15 1995/11/11 01:48:17 bde Exp $ + * $Id: kern_resource.c,v 1.16 1995/11/12 06:42:59 bde Exp $ */ #include <sys/param.h> @@ -49,6 +49,11 @@ #include <sys/proc.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> int donice __P((struct proc *, struct proc *, int)); int dosetrlimit __P((struct proc *, u_int, struct rlimit *)); diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index c46d56c..bee3f8a 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $Id: kern_sig.c,v 1.13 1995/11/12 06:43:00 bde Exp $ + * $Id: kern_sig.c,v 1.14 1995/11/18 10:01:38 bde Exp $ */ #define SIGPROP /* include signal properties table */ @@ -62,6 +62,11 @@ #include <machine/cpu.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <sys/user.h> /* for coredump */ extern int killpg1 __P((struct proc *cp, int signum, int pgid, int all)); diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 34ef802..27fce76 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_synch.c,v 1.14 1995/12/02 17:10:35 bde Exp $ + * $Id: kern_synch.c,v 1.15 1995/12/02 18:58:40 bde Exp $ */ #include <sys/param.h> @@ -47,7 +47,10 @@ #include <sys/signalvar.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #ifdef KTRACE #include <sys/ktrace.h> #endif diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 8e75157..b258bb4 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $Id: kern_sysctl.c,v 1.54 1995/12/05 21:51:33 bde Exp $ + * $Id: kern_sysctl.c,v 1.55 1995/12/06 13:27:38 phk Exp $ */ #include <sys/param.h> @@ -49,8 +49,11 @@ #include <sys/conf.h> #include <sys/sysctl.h> #include <sys/malloc.h> +#include <sys/proc.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> /* * Locking and stats diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 77cdc09..a662efc 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.21 1995/12/04 16:48:20 phk Exp $ + * $Id: kern_clock.c,v 1.22 1995/12/06 13:27:37 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -66,6 +66,11 @@ #include <sys/signalvar.h> #include <sys/timex.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <sys/sysctl.h> #include <machine/cpu.h> diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 77cdc09..a662efc 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.21 1995/12/04 16:48:20 phk Exp $ + * $Id: kern_clock.c,v 1.22 1995/12/06 13:27:37 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -66,6 +66,11 @@ #include <sys/signalvar.h> #include <sys/timex.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <sys/sysctl.h> #include <machine/cpu.h> diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c index 814239e..cffeb54 100644 --- a/sys/kern/subr_rlist.c +++ b/sys/kern/subr_rlist.c @@ -54,7 +54,7 @@ * functioning of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: subr_rlist.c,v 1.11 1995/10/21 08:38:13 davidg Exp $ + * $Id: subr_rlist.c,v 1.12 1995/12/02 18:58:53 bde Exp $ */ #include <sys/param.h> @@ -63,7 +63,9 @@ #include <sys/rlist.h> #include <sys/proc.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> /* * Resource lists. diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 1b92567..5c8a647 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.61 1995/10/09 04:36:01 bde Exp $ + * $Id: trap.c,v 1.62 1995/10/28 15:38:32 phk Exp $ */ /* @@ -45,20 +45,27 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/acct.h> #include <sys/kernel.h> #include <sys/syscall.h> #include <sys/sysent.h> +#include <sys/queue.h> +#include <sys/vmmeter.h> #ifdef KTRACE #include <sys/ktrace.h> #endif +#include <vm/vm.h> #include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/pmap.h> #include <vm/vm_kern.h> #include <vm/vm_map.h> #include <vm/vm_page.h> +#include <vm/vm_extern.h> + +#include <sys/user.h> #include <machine/cpu.h> #include <machine/md_var.h> diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index e7e48b3..ceb4612 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sys_process.c,v 1.15 1995/11/12 06:43:06 bde Exp $ + * $Id: sys_process.c,v 1.16 1995/11/14 09:05:34 phk Exp $ */ #include <sys/param.h> @@ -38,12 +38,20 @@ #include <sys/vnode.h> #include <sys/ptrace.h> #include <sys/errno.h> +#include <sys/queue.h> #include <machine/reg.h> #include <machine/psl.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> #include <sys/user.h> diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 1b35285..78e7f0a 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.11 1995/11/30 07:58:50 julian Exp $ */ +/* $Id: sysv_shm.c,v 1.12 1995/12/04 02:26:53 jkh Exp $ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* @@ -43,8 +43,13 @@ #include <sys/sysent.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> struct shmat_args; extern int shmat __P((struct proc *p, struct shmat_args *uap, int *retval)); diff --git a/sys/kern/tty.c b/sys/kern/tty.c index d9c24e8..8756a0b 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.70 1995/09/10 11:48:13 bde Exp $ + * $Id: tty.c,v 1.71 1995/10/31 19:27:50 bde Exp $ */ /*- @@ -91,6 +91,11 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> static int proc_compare __P((struct proc *p1, struct proc *p2)); static int ttnread __P((struct tty *tp)); diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 7e10b01..027ad19 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: uipc_mbuf.c,v 1.14 1995/12/02 17:10:41 bde Exp $ + * $Id: uipc_mbuf.c,v 1.15 1995/12/02 18:58:42 bde Exp $ */ #include <sys/param.h> @@ -46,7 +46,9 @@ #include <sys/protosw.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> static void mbinit __P((void *)); SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 1394ed1..4a9a905 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.73 1995/12/02 18:58:44 bde Exp $ + * $Id: vfs_bio.c,v 1.74 1995/12/04 16:48:32 phk Exp $ */ /* @@ -40,11 +40,15 @@ #include <sys/sysctl.h> #include <sys/proc.h> #include <sys/vnode.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> #include <vm/vm_kern.h> #include <vm/vm_pageout.h> #include <vm/vm_page.h> #include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <sys/buf.h> #include <sys/mount.h> #include <sys/malloc.h> diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index bc4172f..157baa8 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.27 1995/11/20 03:55:48 dyson Exp $ + * $Id: vfs_cluster.c,v 1.28 1995/11/20 04:53:45 dyson Exp $ */ #include <sys/param.h> @@ -47,6 +47,8 @@ #include <sys/vmmeter.h> #include <miscfs/specfs/specdev.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> #include <vm/vm_object.h> #include <vm/vm_page.h> diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 9d5a5f5..76851ff 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.13 (Berkeley) 4/18/94 - * $Id: vfs_subr.c,v 1.45 1995/12/02 18:58:56 bde Exp $ + * $Id: vfs_subr.c,v 1.46 1995/12/06 13:27:39 phk Exp $ */ /* @@ -61,6 +61,9 @@ #include <sys/mbuf.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <sys/sysctl.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 31b955a..68715c8 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.40 1995/11/14 09:19:16 phk Exp $ + * $Id: vfs_syscalls.c,v 1.41 1995/11/18 11:35:05 bde Exp $ */ #include <sys/param.h> @@ -59,6 +59,9 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <sys/sysctl.h> static int change_dir __P((struct nameidata *ndp, struct proc *p)); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 9d5a5f5..76851ff 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.13 (Berkeley) 4/18/94 - * $Id: vfs_subr.c,v 1.45 1995/12/02 18:58:56 bde Exp $ + * $Id: vfs_subr.c,v 1.46 1995/12/06 13:27:39 phk Exp $ */ /* @@ -61,6 +61,9 @@ #include <sys/mbuf.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <sys/sysctl.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 31b955a..68715c8 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.40 1995/11/14 09:19:16 phk Exp $ + * $Id: vfs_syscalls.c,v 1.41 1995/11/18 11:35:05 bde Exp $ */ #include <sys/param.h> @@ -59,6 +59,9 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <sys/sysctl.h> static int change_dir __P((struct nameidata *ndp, struct proc *p)); diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 46e897f..de25632 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $Id: vfs_vnops.c,v 1.18 1995/10/06 09:43:32 phk Exp $ + * $Id: vfs_vnops.c,v 1.19 1995/10/22 09:32:29 davidg Exp $ */ #include <sys/param.h> @@ -52,6 +52,8 @@ #include <sys/ioctl.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> #include <vm/vnode_pager.h> struct fileops vnops = diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c index 700b619..d11a296 100644 --- a/sys/miscfs/procfs/procfs_ctl.c +++ b/sys/miscfs/procfs/procfs_ctl.c @@ -36,7 +36,7 @@ * * @(#)procfs_ctl.c 8.3 (Berkeley) 1/21/94 * - * $Id: procfs_ctl.c,v 1.6 1995/07/16 10:12:50 bde Exp $ + * $Id: procfs_ctl.c,v 1.7 1995/12/03 14:54:34 bde Exp $ */ #include <sys/param.h> @@ -53,6 +53,8 @@ #include <sys/signalvar.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <miscfs/procfs/procfs.h> diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c index c75665a..d24cbbf 100644 --- a/sys/miscfs/procfs/procfs_mem.c +++ b/sys/miscfs/procfs/procfs_mem.c @@ -37,7 +37,7 @@ * * @(#)procfs_mem.c 8.4 (Berkeley) 1/21/94 * - * $Id: procfs_mem.c,v 1.10 1995/10/23 04:28:59 dyson Exp $ + * $Id: procfs_mem.c,v 1.11 1995/12/03 14:54:35 bde Exp $ */ /* @@ -53,8 +53,15 @@ #include <sys/vnode.h> #include <miscfs/procfs/procfs.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/vm_kern.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> +#include <vm/vm_extern.h> static int procfs_rwmem __P((struct proc *p, struct uio *uio)); diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index ae51350..38e694e 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.6 (Berkeley) 4/9/94 - * $Id: spec_vnops.c,v 1.19 1995/11/29 12:38:49 julian Exp $ + * $Id: spec_vnops.c,v 1.20 1995/12/05 21:51:45 bde Exp $ */ #include <sys/param.h> @@ -48,8 +48,12 @@ #include <sys/ioctl.h> #include <sys/file.h> #include <sys/disklabel.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> #include <vm/vnode_pager.h> diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c index b405705..9f71630 100644 --- a/sys/msdosfs/msdosfs_denode.c +++ b/sys/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_denode.c,v 1.13 1995/08/02 12:59:48 dfr Exp $ */ +/* $Id: msdosfs_denode.c,v 1.14 1995/12/03 16:41:53 bde Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */ /*- @@ -59,6 +59,8 @@ #include <sys/kernel.h> /* defines "time" */ #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <msdosfs/bpb.h> #include <msdosfs/msdosfsmount.h> diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index b0d5cc7..899d9f8 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.28 1995/11/13 18:47:40 bde Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.29 1995/12/03 16:42:02 bde Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- @@ -65,6 +65,8 @@ #include <sys/signalvar.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <msdosfs/bpb.h> #include <msdosfs/direntry.h> diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index a32ca73..303cb22 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.18 1995/10/29 15:32:46 phk Exp $ + * $Id: nfs_bio.c,v 1.19 1995/12/03 10:02:52 bde Exp $ */ #include <sys/param.h> @@ -48,6 +48,8 @@ #include <sys/kernel.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 5118f15..d590ce4 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.23 1995/08/24 10:17:35 dfr Exp $ + * $Id: nfs_subs.c,v 1.24 1995/10/29 15:33:08 phk Exp $ */ /* @@ -59,6 +59,9 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <vm/vnode_pager.h> #include <nfs/rpcv2.h> diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 228513e..0173c99 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.24 1995/08/24 11:39:31 davidg Exp $ + * $Id: nfs_serv.c,v 1.25 1995/10/29 15:32:59 phk Exp $ */ /* @@ -73,6 +73,9 @@ #include <ufs/ufs/dir.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <nfs/nfsproto.h> #include <nfs/rpcv2.h> diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 5118f15..d590ce4 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.23 1995/08/24 10:17:35 dfr Exp $ + * $Id: nfs_subs.c,v 1.24 1995/10/29 15:33:08 phk Exp $ */ /* @@ -59,6 +59,9 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <vm/vnode_pager.h> #include <nfs/rpcv2.h> diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 9876c2d..9387aa8 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_vfsops.c,v 1.21 1995/11/14 09:37:19 phk Exp $ + * $Id: nfs_vfsops.c,v 1.22 1995/12/03 10:03:12 bde Exp $ */ #include <sys/param.h> @@ -53,6 +53,8 @@ #include <sys/systm.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 88827b1..cf8d223 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.29 1995/11/09 08:17:02 bde Exp $ + * $Id: nfs_vnops.c,v 1.30 1995/11/21 15:51:39 bde Exp $ */ /* @@ -59,6 +59,8 @@ #include <ufs/ufs/dir.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <vm/vnode_pager.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index a32ca73..303cb22 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.18 1995/10/29 15:32:46 phk Exp $ + * $Id: nfs_bio.c,v 1.19 1995/12/03 10:02:52 bde Exp $ */ #include <sys/param.h> @@ -48,6 +48,8 @@ #include <sys/kernel.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 5118f15..d590ce4 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.23 1995/08/24 10:17:35 dfr Exp $ + * $Id: nfs_subs.c,v 1.24 1995/10/29 15:33:08 phk Exp $ */ /* @@ -59,6 +59,9 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <vm/vnode_pager.h> #include <nfs/rpcv2.h> diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 9876c2d..9387aa8 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_vfsops.c,v 1.21 1995/11/14 09:37:19 phk Exp $ + * $Id: nfs_vfsops.c,v 1.22 1995/12/03 10:03:12 bde Exp $ */ #include <sys/param.h> @@ -53,6 +53,8 @@ #include <sys/systm.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 88827b1..cf8d223 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.29 1995/11/09 08:17:02 bde Exp $ + * $Id: nfs_vnops.c,v 1.30 1995/11/21 15:51:39 bde Exp $ */ /* @@ -59,6 +59,8 @@ #include <ufs/ufs/dir.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <vm/vnode_pager.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index 228513e..0173c99 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.24 1995/08/24 11:39:31 davidg Exp $ + * $Id: nfs_serv.c,v 1.25 1995/10/29 15:32:59 phk Exp $ */ /* @@ -73,6 +73,9 @@ #include <ufs/ufs/dir.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <nfs/nfsproto.h> #include <nfs/rpcv2.h> diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index 5118f15..d590ce4 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.23 1995/08/24 10:17:35 dfr Exp $ + * $Id: nfs_subs.c,v 1.24 1995/10/29 15:33:08 phk Exp $ */ /* @@ -59,6 +59,9 @@ #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <vm/vnode_pager.h> #include <nfs/rpcv2.h> diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index a44cbf2..5d9dbd3 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.37 1995/11/17 12:11:22 davidg Exp $ + * $Id: if_de.c,v 1.38 1995/11/29 11:19:02 asami Exp $ * */ @@ -82,8 +82,9 @@ #endif #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_param.h> +#include <vm/pmap.h> +#include <vm/vm_kern.h> #if defined(__FreeBSD__) #include <pci.h> diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c index 95a937c..844590e 100644 --- a/sys/pci/if_fxp.c +++ b/sys/pci/if_fxp.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.3 1995/12/05 02:01:51 davidg Exp $ + * $Id: if_fxp.c,v 1.4 1995/12/05 11:49:49 davidg Exp $ */ /* @@ -76,7 +76,7 @@ #include <vm/vm.h> /* for vtophys */ #include <vm/vm_param.h> /* for vtophys */ -#include <machine/pmap.h> /* for vtophys */ +#include <vm/pmap.h> /* for vtophys */ #include <machine/clock.h> /* for DELAY */ #include <pci/pcivar.h> diff --git a/sys/pci/if_pdq.c b/sys/pci/if_pdq.c index ef252cd..854ee91 100644 --- a/sys/pci/if_pdq.c +++ b/sys/pci/if_pdq.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_pdq.c,v 1.9 1995/11/04 15:05:52 bde Exp $ + * $Id: if_pdq.c,v 1.10 1995/12/05 02:01:53 davidg Exp $ * */ @@ -87,7 +87,6 @@ #include <vm/vm.h> #include <vm/vm_kern.h> -#include <vm/vm_param.h> #if NFPA > 0 #include <pci/pcivar.h> diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index bfaa826..b964503 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -65,6 +65,8 @@ #include <vm/vm.h> #include <vm/vm_kern.h> #include <vm/vm_param.h> +#include <vm/pmap.h> +#include <vm/vm_extern.h> #include <pci.h> #if NPCI > 0 diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 7afa62f..093c156 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.48 1995/09/11 19:34:30 se Exp $ +** $Id: ncr.c,v 1.49 1995/09/21 17:27:28 se Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -181,6 +181,8 @@ #define bootverbose 1 #endif #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <vm/vm_extern.h> #endif /* KERNEL */ @@ -1251,7 +1253,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.48 1995/09/11 19:34:30 se Exp $\n"; + "\n$Id: ncr.c,v 1.49 1995/09/21 17:27:28 se Exp $\n"; u_long ncr_version = NCR_VERSION * 11 + (u_long) sizeof (struct ncb) * 7 diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 13d53cc..c80da37 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci.c,v 1.34 1995/11/21 13:59:56 bde Exp $ +** $Id: pci.c,v 1.35 1995/12/06 15:52:23 se Exp $ ** ** General subroutines for the PCI bus. ** pci_configure () @@ -59,8 +59,8 @@ #include <vm/vm.h> #include <vm/vm_param.h> +#include <vm/pmap.h> -#include <machine/pmap.h> #include <sys/devconf.h> #include <i386/isa/isa_device.h> /* XXX inthand2_t */ diff --git a/sys/pci/pdq_os.h b/sys/pci/pdq_os.h index 97bc73dc..60c4538 100644 --- a/sys/pci/pdq_os.h +++ b/sys/pci/pdq_os.h @@ -21,9 +21,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pdq_os.h,v 1.3 1995/07/16 10:07:20 bde Exp $ + * $Id: pdq_os.h,v 1.4 1995/10/29 15:33:36 phk Exp $ * * $Log: pdq_os.h,v $ + * Revision 1.4 1995/10/29 15:33:36 phk + * Second batch of cleanup changes. + * This time mostly making a lot of things static and some unused + * variables here and there. + * * Revision 1.3 1995/07/16 10:07:20 bde * Fix compiler warnings (systm.h wasn't included). * @@ -76,7 +81,10 @@ #endif #include <sys/malloc.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> #ifdef __FreeBSD__ #include <machine/clock.h> diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 665184a..f3cc37a 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -8,7 +8,7 @@ * file. * * Written by Julian Elischer (julian@dialix.oz.au) - * $Id: scsi_base.c,v 1.30 1995/07/25 22:09:06 bde Exp $ + * $Id: scsi_base.c,v 1.31 1995/10/09 15:14:58 joerg Exp $ */ #define SPLSD splbio @@ -23,6 +23,8 @@ #include <sys/malloc.h> #include <sys/errno.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <scsi/scsi_all.h> #include <scsi/scsi_disk.h> #include <scsi/scsiconf.h> diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index d0a9331..7b5e106 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * - * $Id: sd.c,v 1.73 1995/11/29 10:49:02 julian Exp $ + * $Id: sd.c,v 1.74 1995/11/29 14:41:02 julian Exp $ */ #define SPLSD splbio @@ -36,6 +36,8 @@ #include <scsi/scsiconf.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <machine/md_var.h> #include <i386/i386/cons.h> /* XXX */ diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 3b5f56f..a757e18 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: ffs_inode.c,v 1.15 1995/08/16 13:16:58 davidg Exp $ + * $Id: ffs_inode.c,v 1.16 1995/11/05 21:01:15 dyson Exp $ */ #include <sys/param.h> @@ -46,6 +46,8 @@ #include <sys/resourcevar.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 6a559b3..b72f132 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $Id: ffs_vfsops.c,v 1.28 1995/08/28 09:19:10 julian Exp $ + * $Id: ffs_vfsops.c,v 1.29 1995/11/20 12:25:37 phk Exp $ */ #include <sys/param.h> @@ -61,6 +61,8 @@ #include <ufs/ffs/ffs_extern.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> #include <vm/vm_page.h> #include <vm/vm_object.h> diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 1c397d5..9df1715 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vnops.c 8.7 (Berkeley) 2/3/94 - * $Id: ffs_vnops.c,v 1.17 1995/11/09 08:14:01 bde Exp $ + * $Id: ffs_vnops.c,v 1.18 1995/11/14 09:40:06 phk Exp $ */ #include <sys/param.h> @@ -50,8 +50,11 @@ #include <sys/lockf.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> #include <vm/vm_page.h> #include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <miscfs/specfs/specdev.h> #include <miscfs/fifofs/fifo.h> diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c index fb60c3d..a64c34a 100644 --- a/sys/ufs/lfs/lfs_alloc.c +++ b/sys/ufs/lfs/lfs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_alloc.c 8.4 (Berkeley) 1/4/94 - * $Id: lfs_alloc.c,v 1.7 1995/03/28 07:58:02 bde Exp $ + * $Id: lfs_alloc.c,v 1.8 1995/04/16 11:25:47 davidg Exp $ */ #include <sys/param.h> @@ -44,6 +44,8 @@ #include <sys/malloc.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c index deab1c2..a7dfcb5 100644 --- a/sys/ufs/lfs/lfs_inode.c +++ b/sys/ufs/lfs/lfs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_inode.c,v 1.9 1995/05/30 08:15:20 rgrimes Exp $ + * $Id: lfs_inode.c,v 1.10 1995/09/04 00:21:00 dyson Exp $ */ #include <sys/param.h> @@ -45,6 +45,8 @@ #include <sys/malloc.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index fc591d4..948f011 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vnops.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_vnops.c,v 1.14 1995/08/06 11:59:48 davidg Exp $ + * $Id: lfs_vnops.c,v 1.15 1995/11/09 08:14:15 bde Exp $ */ #include <sys/param.h> @@ -50,8 +50,11 @@ #include <sys/malloc.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> #include <vm/vm_page.h> #include <vm/vm_object.h> +#include <vm/vm_extern.h> #include <miscfs/specfs/specdev.h> #include <miscfs/fifofs/fifo.h> diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c index afd483d..a3bd74c 100644 --- a/sys/vm/default_pager.c +++ b/sys/vm/default_pager.c @@ -28,17 +28,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: default_pager.c,v 1.2 1995/07/13 10:29:34 davidg Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/queue.h> #include <vm/vm.h> -#include <vm/vm_pager.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> +#include <vm/vm_pager.h> #include <vm/default_pager.h> #include <vm/swap_pager.h> diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index a892c99..2dd0345 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)device_pager.c 8.1 (Berkeley) 6/11/93 - * $Id: device_pager.c,v 1.14 1995/12/03 12:18:30 bde Exp $ + * $Id: device_pager.c,v 1.15 1995/12/03 18:59:55 bde Exp $ */ #include <sys/param.h> @@ -45,9 +45,13 @@ #include <sys/mman.h> #include <sys/malloc.h> #include <sys/proc.h> +#include <sys/queue.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> #include <vm/vm_kern.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> #include <vm/device_pager.h> diff --git a/sys/vm/kern_lock.c b/sys/vm/kern_lock.c index 409e784..2e984b0 100644 --- a/sys/vm/kern_lock.c +++ b/sys/vm/kern_lock.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: kern_lock.c,v 1.8 1995/11/06 08:44:15 davidg Exp $ + * $Id: kern_lock.c,v 1.9 1995/11/20 12:20:02 phk Exp $ */ /* @@ -75,6 +75,9 @@ #include <sys/proc.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> /* * Routine: lock_init diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 482071f..a2cc738 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 - * $Id: swap_pager.c,v 1.51 1995/11/20 12:19:58 phk Exp $ + * $Id: swap_pager.c,v 1.52 1995/12/03 12:18:33 bde Exp $ */ /* @@ -56,16 +56,21 @@ #include <sys/buf.h> #include <sys/vnode.h> #include <sys/malloc.h> +#include <sys/vmmeter.h> #include <miscfs/specfs/specdev.h> #include <sys/rlist.h> #include <vm/vm.h> -#include <vm/vm_pager.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> +#include <vm/vm_pager.h> #include <vm/vm_pageout.h> #include <vm/swap_pager.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> #ifndef NPENDINGIO #define NPENDINGIO 10 diff --git a/sys/vm/vm.h b/sys/vm/vm.h index e591b29..f56dd1b 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -31,13 +31,14 @@ * SUCH DAMAGE. * * @(#)vm.h 8.2 (Berkeley) 12/13/93 - * $Id: vm.h,v 1.6 1995/10/05 01:11:48 bde Exp $ + * $Id: vm.h,v 1.7 1995/12/05 20:54:42 bde Exp $ */ #ifndef VM_H #define VM_H typedef char vm_inherit_t; /* XXX: inheritance codes */ +typedef u_char vm_prot_t; /* protection codes */ union vm_map_object; typedef union vm_map_object vm_map_object_t; @@ -60,38 +61,4 @@ struct vm_page; typedef struct vm_page *vm_page_t; #endif -#include <sys/vmmeter.h> -#include <sys/queue.h> -#include <vm/vm_param.h> -#include <vm/lock.h> -#include <vm/vm_prot.h> -#include <vm/vm_inherit.h> -#include <vm/vm_map.h> -#include <vm/vm_object.h> -#include <vm/pmap.h> -#include <vm/vm_extern.h> - -/* - * Shareable process virtual address space. - * May eventually be merged with vm_map. - * Several fields are temporary (text, data stuff). - */ -struct vmspace { - struct vm_map vm_map; /* VM address map */ - struct pmap vm_pmap; /* private physical map */ - int vm_refcnt; /* number of references */ - caddr_t vm_shm; /* SYS5 shared memory private data XXX */ -/* we copy from vm_startcopy to the end of the structure on fork */ -#define vm_startcopy vm_rssize - segsz_t vm_rssize; /* current resident set size in pages */ - segsz_t vm_swrss; /* resident set size before last swap */ - segsz_t vm_tsize; /* text size (pages) XXX */ - segsz_t vm_dsize; /* data size (pages) XXX */ - segsz_t vm_ssize; /* stack size (pages) */ - caddr_t vm_taddr; /* user virtual address of text XXX */ - caddr_t vm_daddr; /* user virtual address of data XXX */ - caddr_t vm_maxsaddr; /* user VA at max stack growth */ - caddr_t vm_minsaddr; /* user VA at max stack growth */ -}; - #endif /* VM_H */ diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index cb450d0..8352acb 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $Id: vm_extern.h,v 1.18 1995/08/28 09:19:21 julian Exp $ + * $Id: vm_extern.h,v 1.19 1995/11/14 09:29:29 phk Exp $ */ #ifndef _VM_EXTERN_H_ @@ -91,7 +91,9 @@ void vm_fault_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t)); int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t)); int vm_fork __P((struct proc *, struct proc *, int)); +void vm_map_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int, char *)); int vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, caddr_t, vm_offset_t)); +void vm_object_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int, char *)); vm_offset_t vm_page_alloc_contig __P((vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t)); void vm_set_page_size __P((void)); void vmmeter __P((void)); diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 2413054..bd75361 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -66,7 +66,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_fault.c,v 1.36 1995/11/05 20:45:58 dyson Exp $ + * $Id: vm_fault.c,v 1.37 1995/11/20 12:19:53 phk Exp $ */ /* @@ -80,14 +80,22 @@ #include <sys/resource.h> #include <sys/signalvar.h> #include <sys/resourcevar.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> #include <vm/vm_kern.h> #include <vm/vm_pager.h> #include <vm/vnode_pager.h> #include <vm/swap_pager.h> +#include <vm/vm_extern.h> int vm_fault_additional_pages __P((vm_page_t, int, int, vm_page_t *, int *)); diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index ae340ef..90dee12 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -59,7 +59,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_glue.c,v 1.30 1995/11/05 20:45:59 dyson Exp $ + * $Id: vm_glue.c,v 1.31 1995/12/02 17:11:18 bde Exp $ */ #include <sys/param.h> @@ -68,15 +68,24 @@ #include <sys/resourcevar.h> #include <sys/buf.h> #include <sys/shm.h> -#include <sys/user.h> +#include <sys/vmmeter.h> #include <sys/kernel.h> #include <sys/dkstat.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_inherit.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> + +#include <sys/user.h> #include <machine/stdarg.h> #include <machine/cpu.h> diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 8c15825..a3ad636 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_init.c,v 1.9 1995/09/09 18:10:36 davidg Exp $ + * $Id: vm_init.c,v 1.10 1995/12/02 17:11:20 bde Exp $ */ /* @@ -71,11 +71,18 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> +#include <sys/queue.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> #include <vm/vm_kern.h> #include <vm/vm_pager.h> +#include <vm/vm_extern.h> /* * System initialization diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index f8b9b0b..15a1fde 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_kern.c,v 1.16 1995/09/03 20:40:39 dyson Exp $ + * $Id: vm_kern.c,v 1.17 1995/11/13 10:53:38 davidg Exp $ */ /* @@ -74,8 +74,16 @@ #include <sys/proc.h> #include <sys/malloc.h> #include <sys/syslog.h> +#include <sys/queue.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> #include <vm/vm_kern.h> diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 98ac230..04f2d38 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.26 1995/11/12 08:58:58 davidg Exp $ + * $Id: vm_map.c,v 1.27 1995/11/20 12:19:49 phk Exp $ */ /* @@ -72,12 +72,21 @@ #include <sys/systm.h> #include <sys/malloc.h> #include <sys/proc.h> +#include <sys/queue.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/vm_inherit.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/vm_page.h> #include <vm/vm_object.h> #include <vm/vm_kern.h> #include <vm/vm_pager.h> +#include <vm/vm_extern.h> /* * Virtual memory maps provide for the mapping, protection, diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 07c17c0..93d07b9 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.h,v 1.6 1995/07/13 08:48:28 davidg Exp $ + * $Id: vm_map.h,v 1.7 1995/08/26 23:18:37 bde Exp $ */ /* @@ -138,6 +138,30 @@ struct vm_map { #define max_offset header.end }; +/* + * Shareable process virtual address space. + * May eventually be merged with vm_map. + * Several fields are temporary (text, data stuff). + */ +struct vmspace { + struct vm_map vm_map; /* VM address map */ + struct pmap vm_pmap; /* private physical map */ + int vm_refcnt; /* number of references */ + caddr_t vm_shm; /* SYS5 shared memory private data XXX */ +/* we copy from vm_startcopy to the end of the structure on fork */ +#define vm_startcopy vm_rssize + segsz_t vm_rssize; /* current resident set size in pages */ + segsz_t vm_swrss; /* resident set size before last swap */ + segsz_t vm_tsize; /* text size (pages) XXX */ + segsz_t vm_dsize; /* data size (pages) XXX */ + segsz_t vm_ssize; /* stack size (pages) */ + caddr_t vm_taddr; /* user virtual address of text XXX */ + caddr_t vm_daddr; /* user virtual address of data XXX */ + caddr_t vm_maxsaddr; /* user VA at max stack growth */ + caddr_t vm_minsaddr; /* user VA at max stack growth */ +}; + + /* * Map versions are used to validate a previous lookup attempt. * @@ -204,10 +228,6 @@ void vm_map_lookup_done __P((vm_map_t, vm_map_entry_t)); boolean_t vm_map_lookup_entry __P((vm_map_t, vm_offset_t, vm_map_entry_t *)); int vm_map_pageable __P((vm_map_t, vm_offset_t, vm_offset_t, boolean_t)); int vm_map_clean __P((vm_map_t, vm_offset_t, vm_offset_t, boolean_t, boolean_t)); -#ifdef DDB -void vm_map_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int, - char *)); -#endif int vm_map_protect __P((vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t)); void vm_map_reference __P((vm_map_t)); int vm_map_remove __P((vm_map_t, vm_offset_t, vm_offset_t)); diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index e262ce9..1dea61b 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -31,14 +31,23 @@ * SUCH DAMAGE. * * @(#)vm_meter.c 8.4 (Berkeley) 1/4/94 - * $Id: vm_meter.c,v 1.9 1995/11/14 09:29:34 phk Exp $ + * $Id: vm_meter.c,v 1.10 1995/12/04 16:48:58 phk Exp $ */ #include <sys/param.h> #include <sys/proc.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/vmmeter.h> +#include <sys/queue.h> + #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> #include <sys/sysctl.h> struct loadavg averunnable = diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index f14a470..2514754 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $Id: vm_mmap.c,v 1.29 1995/11/12 06:43:24 bde Exp $ + * $Id: vm_mmap.c,v 1.30 1995/12/03 12:18:35 bde Exp $ */ /* @@ -55,13 +55,21 @@ #include <sys/file.h> #include <sys/mman.h> #include <sys/conf.h> +#include <sys/vmmeter.h> #include <miscfs/specfs/specdev.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/vm_inherit.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> #include <vm/vm_pager.h> #include <vm/vm_pageout.h> -#include <vm/vm_prot.h> +#include <vm/vm_extern.h> extern void pmap_object_init_pt __P((pmap_t pmap, vm_offset_t addr, vm_object_t object, vm_offset_t offset, diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index c3cb783..4627685 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.c,v 1.56 1995/11/20 12:19:41 phk Exp $ + * $Id: vm_object.c,v 1.57 1995/12/03 12:18:37 bde Exp $ */ /* @@ -75,13 +75,21 @@ #include <sys/malloc.h> #include <sys/vnode.h> #include <sys/mount.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> #include <vm/vm_pager.h> #include <vm/swap_pager.h> #include <vm/vm_kern.h> +#include <vm/vm_extern.h> #ifdef DDB extern void vm_object_check __P((void)); diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 8b02609..287471b 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.h,v 1.22 1995/08/26 23:19:49 bde Exp $ + * $Id: vm_object.h,v 1.23 1995/11/05 20:46:01 dyson Exp $ */ /* @@ -172,10 +172,6 @@ void vm_object_page_clean __P((vm_object_t, vm_offset_t, vm_offset_t, boolean_t, void vm_object_page_remove __P((vm_object_t, vm_offset_t, vm_offset_t, boolean_t)); void vm_object_pmap_copy __P((vm_object_t, vm_offset_t, vm_offset_t)); void vm_object_pmap_remove __P((vm_object_t, vm_offset_t, vm_offset_t)); -#ifdef DDB -void vm_object_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int, - char *)); -#endif void vm_object_reference __P((vm_object_t)); void vm_object_shadow __P((vm_object_t *, vm_offset_t *, vm_size_t)); void vm_object_terminate __P((vm_object_t)); diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 12150e1..6b61358 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_page.c,v 1.38 1995/11/20 12:19:34 phk Exp $ + * $Id: vm_page.c,v 1.39 1995/12/03 12:18:39 bde Exp $ */ /* @@ -71,12 +71,19 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <sys/queue.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> #include <vm/vm_kern.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_map.h> #include <vm/vm_pageout.h> +#include <vm/vm_extern.h> #ifdef DDB extern void print_page_info __P((void)); diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index f2b5b31..561be29 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -65,7 +65,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pageout.c,v 1.59 1995/11/05 20:46:02 dyson Exp $ + * $Id: vm_pageout.c,v 1.60 1995/11/20 12:19:26 phk Exp $ */ /* @@ -81,13 +81,20 @@ #include <sys/kernel.h> #include <sys/signalvar.h> #include <sys/vnode.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/lock.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> #include <vm/vm_pageout.h> #include <vm/vm_kern.h> #include <vm/vm_pager.h> #include <vm/swap_pager.h> +#include <vm/vm_extern.h> /* * System initialization diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 82b5628..ea508eb 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pager.c,v 1.17 1995/07/29 11:44:29 bde Exp $ + * $Id: vm_pager.c,v 1.18 1995/11/20 12:19:19 phk Exp $ */ /* @@ -77,9 +77,13 @@ #include <sys/ucred.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_kern.h> #include <vm/vm_pager.h> +#include <vm/vm_extern.h> extern struct pagerops defaultpagerops; extern struct pagerops swappagerops; diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h index 36079a0..c6d55d5 100644 --- a/sys/vm/vm_prot.h +++ b/sys/vm/vm_prot.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_prot.h,v 1.3 1994/08/02 07:55:38 davidg Exp $ + * $Id: vm_prot.h,v 1.4 1995/01/09 16:05:57 davidg Exp $ */ /* @@ -72,14 +72,6 @@ #define _VM_PROT_ /* - * Types defined: - * - * vm_prot_t VM protection values. - */ - -typedef u_char vm_prot_t; - -/* * Protection values, defined as bits within the vm_prot_t type */ diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 76f0c28..c91b10e 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.26 1995/11/29 10:49:16 julian Exp $ + * $Id: vm_swap.c,v 1.27 1995/11/29 14:41:20 julian Exp $ */ #include <sys/param.h> @@ -47,6 +47,8 @@ #include <sys/rlist.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_extern.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c index 9d2668d..883e36d 100644 --- a/sys/vm/vm_unix.c +++ b/sys/vm/vm_unix.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$ * * @(#)vm_unix.c 8.1 (Berkeley) 6/11/93 - * $Id: vm_unix.c,v 1.7 1995/11/11 06:40:35 bde Exp $ + * $Id: vm_unix.c,v 1.8 1995/11/12 06:43:28 bde Exp $ */ /* @@ -51,6 +51,10 @@ #include <sys/resourcevar.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/lock.h> +#include <vm/pmap.h> +#include <vm/vm_map.h> #include <vm/swap_pager.h> #ifndef _SYS_SYSPROTO_H_ diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index a31aa68..c8401b9 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $Id: vnode_pager.c,v 1.52 1995/10/30 17:56:30 bde Exp $ + * $Id: vnode_pager.c,v 1.53 1995/11/20 12:19:11 phk Exp $ */ /* @@ -60,11 +60,16 @@ #include <sys/uio.h> #include <sys/mount.h> #include <sys/buf.h> +#include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_prot.h> +#include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> #include <vm/vnode_pager.h> +#include <vm/vm_extern.h> extern vm_offset_t vnode_pager_addr __P((struct vnode *vp, vm_offset_t address, int *run)); |
