changes for new vm

SCCS-vsn: sys/i386/conf/Makefile.i386 1.2
SCCS-vsn: sys/i386/conf/files.i386 1.2
SCCS-vsn: sys/i386/conf/ARGO 1.2
SCCS-vsn: sys/i386/conf/CIRCE 1.2

diff --git a/usr/src/sys/i386/conf/ARGO b/usr/src/sys/i386/conf/ARGO
index 679fd10..7bcf5ca 100644 (file)
--- a/usr/src/sys/i386/conf/ARGO
+++ b/usr/src/sys/i386/conf/ARGO
@@ -37,4 +37,8 @@ pseudo-device loop
 pseudo-device  pty
 pseudo-device  ether
 pseudo-device  sl      2
 pseudo-device  pty
 pseudo-device  ether
 pseudo-device  sl      2

+pseudo-device  log     4

 
 

+pseudo-device  swappager
+pseudo-device  vnodepager
+pseudo-device  devpager

diff --git a/usr/src/sys/i386/conf/CIRCE b/usr/src/sys/i386/conf/CIRCE
index 8f29b06..c8473d1 100644 (file)
--- a/usr/src/sys/i386/conf/CIRCE
+++ b/usr/src/sys/i386/conf/CIRCE
@@ -6,17 +6,18 @@ cpu           "i486"
 ident          CIRCE
 timezone       8 dst
 maxusers       10
 ident          CIRCE
 timezone       8 dst
 maxusers       10

+
+# Standard options
+options                QUOTA

 options                INET
 options                INET

-#options               NS
-#options               KADB
-#options               QUOTA
-options                NFS
-options                MFS
-options                DIAGNOSTIC
-options                "TCP_COMPAT_42"
+options                MFS,NFS,FIFO

 options                "COMPAT_43"
 options                "COMPAT_43"

+options                "COMPAT_42","TCP_COMPAT_42"
+
+# Options specific to this host.
+options                DEBUG,DIAGNOSTIC

 options                KTRACE
 options                KTRACE

-options                GATEWAY                 # slip needs this for packet forwarding
+options                "NKMEMCLUSTERS=256"

 
 config         vmunix  root on dk0 swap on dk0
 
 
 config         vmunix  root on dk0 swap on dk0
 


@@ -44,3 +45,8 @@ pseudo-device pty
 pseudo-device  ether
 pseudo-device  sl      2
 
 pseudo-device  ether
 pseudo-device  sl      2
 

+pseudo-device  log     4
+
+pseudo-device  swappager
+pseudo-device  vnodepager
+pseudo-device  devpager

diff --git a/usr/src/sys/i386/conf/Makefile.i386 b/usr/src/sys/i386/conf/Makefile.i386
index b94b199..ada9d11 100644 (file)
--- a/usr/src/sys/i386/conf/Makefile.i386
+++ b/usr/src/sys/i386/conf/Makefile.i386
@@ -1,5 +1,5 @@
 # Copyright 1990 W. Jolitz
 # Copyright 1990 W. Jolitz

-# @(#)Makefile.i386    1.1 %G%
+# @(#)Makefile.i386    1.2 %G%

 # Makefile for 4.3 BSD-Reno
 #
 # This makefile is constructed from a machine description:
 # Makefile for 4.3 BSD-Reno
 #
 # This makefile is constructed from a machine description:


@@ -9,26 +9,19 @@
 # after which you should do
 #       config machineid
 # Generic makefile changes should be made in
 # after which you should do
 #       config machineid
 # Generic makefile changes should be made in

-#      /sys/conf/Makefile.i386
+#      /sys/i386/conf/Makefile.i386

 # after which config should be rerun for all machines.
 #
 # after which config should be rerun for all machines.
 #

-# N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE
-#      IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
-#
-# -DTRACE      compile in kernel tracing hooks
-# -DQUOTA      compile in file system quotas
-#

 TOUCH= touch -f -c
 LD=    /usr/bin/ld
 TOUCH= touch -f -c
 LD=    /usr/bin/ld

-CC=    cc -Dconst=__const__ -Dvolatile=__volatile__ \
-               -Dsigned=__signed__ -Dinline=__inline__ \
-               -Uunix -fpcc-struct-return
+CC=    cc
+CPP=   cpp

 
 S=     ../..
 I386=  ../../i386
 
 INCLUDES= -I. -I$S -I$S/sys
 
 S=     ../..
 I386=  ../../i386
 
 INCLUDES= -I. -I$S -I$S/sys

-COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX -DREFBIT
+COPTS= ${INCLUDES} ${IDENT} -DKERNEL -DNVM -Di386 -DNPX

 CFLAGS=        -O ${COPTS}
 
 %OBJS
 CFLAGS=        -O ${COPTS}
 
 %OBJS


@@ -53,11 +46,7 @@ symbols.sort: ${I386}/i386/symbols.raw
 
 locore.o: assym.s ${I386}/i386/locore.s machine/trap.h machine/psl.h machine/pte.h \
        vector.s ${I386}/isa/icu.s ${I386}/isa/isa.h ${I386}/isa/icu.h
 
 locore.o: assym.s ${I386}/i386/locore.s machine/trap.h machine/psl.h machine/pte.h \
        vector.s ${I386}/isa/icu.s ${I386}/isa/isa.h ${I386}/isa/icu.h

-       cat assym.s ${I386}/i386/locore.s vector.s ${I386}/isa/icu.s > locore.c
-       ${CC} -E -I. -DLOCORE ${COPTS} locore.c > locore.i
-       @echo 'as -o locore.o locore.i'
-       @${AS} -o locore.o locore.i
-       @rm locore.i locore.c
+       ${CPP} -E -I. -DLOCORE ${COPTS} ${I386}/i386/locore.s | ${AS} -o locore.o

 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile


@@ -71,8 +60,8 @@ assym.s machdep.o: Makefile
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 

-assym.s: $S/sys/param.h machine/pte.h $S/sys/buf.h $S/sys/vmparam.h \
-    $S/sys/vmmeter.h $S/sys/cmap.h $S/sys/map.h \
+assym.s: $S/sys/param.h machine/pte.h $S/sys/buf.h \
+    $S/sys/vmmeter.h $S/sys/map.h \

     $S/sys/proc.h $S/sys/msgbuf.h machine/vmparam.h
 
 assym.s: genassym
     $S/sys/proc.h $S/sys/msgbuf.h machine/vmparam.h
 
 assym.s: genassym


@@ -98,7 +87,8 @@ tags:
        @echo "see $S/kern/Makefile for tags"
 
 ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h $S/sys/map.h \
        @echo "see $S/kern/Makefile for tags"
 
 ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h $S/sys/map.h \

-    $S/sys/vm.h ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
+    ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
+       ${CC} -traditional -c ${CFLAGS} ioconf.c

 
 param.c: $S/conf/param.c
        -rm -f param.c
 
 param.c: $S/conf/param.c
        -rm -f param.c

diff --git a/usr/src/sys/i386/conf/files.i386 b/usr/src/sys/i386/conf/files.i386
index 140675e..95d85d5 100644 (file)
--- a/usr/src/sys/i386/conf/files.i386
+++ b/usr/src/sys/i386/conf/files.i386
@@ -7,6 +7,7 @@ i386/i386/kdb_opset.c   optional kadb
 i386/i386/in_cksum.c   optional inet
 i386/i386/machdep.c            standard config-dependent
 i386/i386/mem.c                standard
 i386/i386/in_cksum.c   optional inet
 i386/i386/machdep.c            standard config-dependent
 i386/i386/mem.c                standard

+i386/i386/pmap.c       standard

 i386/i386/ns_cksum.c   optional ns
 i386/i386/sys_machdep.c        standard
 i386/i386/trap.c               standard
 i386/i386/ns_cksum.c   optional ns
 i386/i386/sys_machdep.c        standard
 i386/i386/trap.c               standard