diff options
Diffstat (limited to 'sys')
40 files changed, 40 insertions, 100 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index b5bdadd86bb..49b3f7845bb 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.82 2001/06/26 20:23:18 art Exp $ +# $OpenBSD: GENERIC,v 1.83 2001/06/27 05:46:07 art Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -9,7 +9,6 @@ include "../../../conf/GENERIC" maxusers 32 option PMAP_NEW # required -option UVM # required # CPU Support option DEC_3000_500 # Flamingo etc: 3000/[4-9]00* diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index a3e22f736fd..5d85b85d4bd 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,9 +1,8 @@ -# $OpenBSD: RAMDISK,v 1.44 2001/06/23 19:46:56 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.45 2001/06/27 05:46:08 art Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED -option UVM # required option PMAP_NEW # required option SMALL_KERNEL diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB index 9a521577a04..c542d123ca2 100644 --- a/sys/arch/alpha/conf/RAMDISKB +++ b/sys/arch/alpha/conf/RAMDISKB @@ -1,9 +1,8 @@ -# $OpenBSD: RAMDISKB,v 1.9 2001/06/23 19:46:57 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.10 2001/06/27 05:46:08 art Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED -option UVM # required option PMAP_NEW # required option SMALL_KERNEL diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index 6636372490c..7c0b89711ef 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.13 2001/06/23 19:46:57 deraadt Exp $ +# $OpenBSD: RAMDISKBIG,v 1.14 2001/06/27 05:46:08 art Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -6,7 +6,6 @@ machine alpha option PMAP_NEW # required -option UVM # required # CPU Support option DEC_3000_500 # Flamingo etc: 3000/[4-9]00* diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO index 94db07f4efc..bf00d09b3c2 100644 --- a/sys/arch/amiga/conf/DRACO +++ b/sys/arch/amiga/conf/DRACO @@ -1,4 +1,4 @@ -# $OpenBSD: DRACO,v 1.14 2000/11/08 11:53:54 art Exp $ +# $OpenBSD: DRACO,v 1.15 2001/06/27 05:46:10 art Exp $ # $NetBSD: DRACO,v 1.7 1996/12/20 19:18:16 veego Exp $ # @@ -23,8 +23,6 @@ option DRACO option "M68060" # support for 060 option "M060SP" # MC68060 software support (Required for 060) -option UVM # use the UVM virtual memory system - # # Networking options # diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC index 6923e0a973e..b73847acff2 100644 --- a/sys/arch/amiga/conf/GENERIC +++ b/sys/arch/amiga/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.34 2001/03/08 03:37:17 itojun Exp $ +# $OpenBSD: GENERIC,v 1.35 2001/06/27 05:46:10 art Exp $ # $NetBSD: GENERIC,v 1.85 1997/08/27 19:32:49 is Exp $ # @@ -34,8 +34,6 @@ option M68030 # support for 030 option M68020 # support for 020/851 option FPU_EMULATE # FPU emulation -option UVM # use the UVM virtual memory system - # # File systems # diff --git a/sys/arch/amiga/conf/RAMDISK b/sys/arch/amiga/conf/RAMDISK index 2ab1a08cc3e..3c05312984b 100644 --- a/sys/arch/amiga/conf/RAMDISK +++ b/sys/arch/amiga/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.9 2000/11/08 11:53:54 art Exp $ +# $OpenBSD: RAMDISK,v 1.10 2001/06/27 05:46:11 art Exp $ # # A ramdisk kernel @@ -25,8 +25,6 @@ option "M68030" # support for 030 option "M68020" # support for 020/851 option FPU_EMULATE # FPU emulation -option UVM # use the UVM virtual memory system - # # File systems # diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS index 20cf279c1bf..d54c1755691 100644 --- a/sys/arch/hp300/conf/DISKLESS +++ b/sys/arch/hp300/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.18 2001/05/04 22:48:58 aaron Exp $ +# $OpenBSD: DISKLESS,v 1.19 2001/06/27 05:46:11 art Exp $ # $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $ # # Generic kernel - one size fits all. @@ -24,8 +24,6 @@ option HP400 option HP425 option HP433 -option UVM # use the UVM virtual memory system - # Need to set locally maxusers 8 diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index a0e3ca36866..a8cd3148fe9 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.26 2001/05/04 22:48:58 aaron Exp $ +# $OpenBSD: GENERIC,v 1.27 2001/06/27 05:46:12 art Exp $ # $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $ # # Generic kernel - one size fits all. @@ -24,8 +24,6 @@ option HP400 option HP425 option HP433 -option UVM # use the UVM virtual memory system - # Need to set locally maxusers 32 diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK index ea755341a4b..c72ef4ac4c3 100644 --- a/sys/arch/hp300/conf/RAMDISK +++ b/sys/arch/hp300/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.11 2001/06/23 19:46:57 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.12 2001/06/27 05:46:12 art Exp $ # # Ram disk kernel. # @@ -20,8 +20,6 @@ option HP400 option HP425 option HP433 -option UVM # use the UVM virtual memory system - maxusers 8 option TIMEZONE=0 # time zone to adjust RTC time by diff --git a/sys/arch/hppa/conf/std.hppa b/sys/arch/hppa/conf/std.hppa index 7e9b7ff74c5..77499811539 100644 --- a/sys/arch/hppa/conf/std.hppa +++ b/sys/arch/hppa/conf/std.hppa @@ -1,12 +1,10 @@ -# $OpenBSD: std.hppa,v 1.3 2000/06/21 00:13:09 mickey Exp $ +# $OpenBSD: std.hppa,v 1.4 2001/06/27 05:46:13 art Exp $ # # Standard devices present on every hppa workstation # machine hppa -option UVM - mainbus0 at root # root "bus" mem* at mainbus0 # /dev/*mem and memory controller diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index f948eb0bab9..fab49c0f539 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.35 2001/05/17 00:57:55 pvalchev Exp $ +# $OpenBSD: DISKLESS,v 1.36 2001/06/27 05:46:14 art Exp $ # $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $ # # DISKLESS -- Generic machine setup for diskless boot. @@ -14,8 +14,6 @@ option I586_CPU option I686_CPU option GPL_MATH_EMULATE # floating point emulation -option UVM # use the UVM virtual memory system. REQUIRED - #option VM86 # Virtual 8086 emulation #option USER_LDT # user-settable LDT; used by WINE option XSERVER # diddle with console driver diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index bf643d7cc40..850ba1f5a78 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.267 2001/06/26 21:40:43 jason Exp $ +# $OpenBSD: GENERIC,v 1.268 2001/06/27 05:46:14 art Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -14,8 +14,6 @@ option I586_CPU option I686_CPU option GPL_MATH_EMULATE # floating point emulation. required. -option UVM # use the UVM virtual memory system. REQUIRED - option USER_PCICONF # user-space PCI configuration #option VM86 # Virtual 8086 emulation diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index e60843505a8..1b92a17388c 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.106 2001/06/23 19:46:57 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.107 2001/06/27 05:46:15 art Exp $ machine i386 # architecture, used by config; REQUIRED @@ -11,7 +11,6 @@ option I586_CPU option I686_CPU option GPL_MATH_EMULATE # floating point emulation -option UVM # use the UVM virtual memory system. REQUIRED option SMALL_KERNEL #option DUMMY_NOPS # speed hack; recommended diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 5961c93a6ba..606042be0c7 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.40 2001/06/23 19:46:57 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.41 2001/06/27 05:46:15 art Exp $ machine i386 # architecture, used by config; REQUIRED @@ -11,7 +11,6 @@ option I586_CPU option I686_CPU option GPL_MATH_EMULATE # floating point emulation -option UVM # use the UVM virtual memory system. REQUIRED option SMALL_KERNEL #option DUMMY_NOPS # speed hack; recommended diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index b9c5743775a..964df8d0c19 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.21 2001/06/23 19:46:58 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.22 2001/06/27 05:46:16 art Exp $ machine i386 # architecture, used by config; REQUIRED @@ -11,7 +11,6 @@ option I586_CPU option I686_CPU option GPL_MATH_EMULATE # floating point emulation -option UVM # use the UVM virtual memory system. REQUIRED option SMALL_KERNEL #option DUMMY_NOPS # speed hack; recommended diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 4fbe9843d61..a02f765c53a 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.46 2001/06/23 19:46:58 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.47 2001/06/27 05:46:16 art Exp $ machine i386 # architecture, used by config; REQUIRED @@ -11,8 +11,6 @@ option I586_CPU option I686_CPU option GPL_MATH_EMULATE # floating point emulation -option UVM # use the UVM virtual memory system. REQUIRED - #option DUMMY_NOPS # speed hack; recommended maxusers 4 # estimated number of users diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 2c94490744e..45e0fbc134d 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.27 2001/05/08 17:30:39 aaron Exp $ +# $OpenBSD: GENERIC,v 1.28 2001/06/27 05:46:17 art Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERIC - an all-in-one kernel for the mac68k @@ -19,8 +19,6 @@ option DISABLE_EXT_CACHE # Don't use IIci external cache option DISABLE_ADB_WITH_SERIAL_CONSOLE #option MRG_ADB # Use ROM-based ADB driver -option UVM # use the UVM virtual memory system - config bsd swap generic maxusers 16 diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC index 68e4a966fa7..9bdee67d619 100644 --- a/sys/arch/mac68k/conf/GENERICSBC +++ b/sys/arch/mac68k/conf/GENERICSBC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERICSBC,v 1.11 2001/05/08 17:30:39 aaron Exp $ +# $OpenBSD: GENERICSBC,v 1.12 2001/06/27 05:46:17 art Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERICSBC --- our generic kernel using the SBC SCSI driver @@ -19,8 +19,6 @@ option DISABLE_EXT_CACHE # Don't use IIci external cache option DISABLE_ADB_WITH_SERIAL_CONSOLE #option MRG_ADB # Use ROM-based ADB driver -option UVM # use the UVM virtual memory system - config bsd swap generic maxusers 16 diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC index 3f19885b71e..080f8efbeb7 100644 --- a/sys/arch/mvme68k/conf/GENERIC +++ b/sys/arch/mvme68k/conf/GENERIC @@ -1,9 +1,8 @@ -# $OpenBSD: GENERIC,v 1.18 2001/06/26 21:35:24 miod Exp $ +# $OpenBSD: GENERIC,v 1.19 2001/06/27 05:46:18 art Exp $ machine mvme68k m68k include "../../../conf/GENERIC" -option UVM option M68030 # support for 030 option M68040 # support for 040 diff --git a/sys/arch/mvme68k/conf/MINIROOT b/sys/arch/mvme68k/conf/MINIROOT index 30aec99464c..fda536a500e 100644 --- a/sys/arch/mvme68k/conf/MINIROOT +++ b/sys/arch/mvme68k/conf/MINIROOT @@ -1,9 +1,8 @@ -# $OpenBSD: MINIROOT,v 1.9 2001/06/26 21:35:24 miod Exp $ +# $OpenBSD: MINIROOT,v 1.10 2001/06/27 05:46:19 art Exp $ machine mvme68k m68k include "../../../conf/GENERIC" -option UVM option M68060 # support for 060 option M68040 # support for 040 diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147 index 91f3f42b2dc..3174bd3ee4b 100644 --- a/sys/arch/mvme68k/conf/MVME147 +++ b/sys/arch/mvme68k/conf/MVME147 @@ -1,9 +1,7 @@ -# $OpenBSD: MVME147,v 1.13 2001/06/26 21:35:24 miod Exp $ +# $OpenBSD: MVME147,v 1.14 2001/06/27 05:46:19 art Exp $ machine mvme68k m68k -option UVM - #option "M68040" # support for 040 #option FPSP # MC68040 floating point support option "M68030" # support for 030 diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162 index cf3d6e9adcd..aebd5fadbe7 100644 --- a/sys/arch/mvme68k/conf/MVME162 +++ b/sys/arch/mvme68k/conf/MVME162 @@ -1,9 +1,7 @@ -# $OpenBSD: MVME162,v 1.16 2001/06/26 21:35:24 miod Exp $ +# $OpenBSD: MVME162,v 1.17 2001/06/27 05:46:19 art Exp $ machine mvme68k m68k -option UVM - option "M68040" # support for 040 option FPSP # MC68040 floating point support #option "M68030" # support for 030 diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167 index 6065aba4b0b..9e8f5c1d84c 100644 --- a/sys/arch/mvme68k/conf/MVME167 +++ b/sys/arch/mvme68k/conf/MVME167 @@ -1,9 +1,7 @@ -# $OpenBSD: MVME167,v 1.16 2001/06/26 21:35:24 miod Exp $ +# $OpenBSD: MVME167,v 1.17 2001/06/27 05:46:20 art Exp $ machine mvme68k m68k -option UVM - option "M68040" # support for 040 option FPSP # MC68040 floating point support #option "M68030" # support for 030 diff --git a/sys/arch/mvme68k/conf/MVME177 b/sys/arch/mvme68k/conf/MVME177 index f57b25b1e96..ea785a19548 100644 --- a/sys/arch/mvme68k/conf/MVME177 +++ b/sys/arch/mvme68k/conf/MVME177 @@ -1,9 +1,8 @@ -# $OpenBSD: MVME177,v 1.6 2001/06/26 21:35:25 miod Exp $ +# $OpenBSD: MVME177,v 1.7 2001/06/27 05:46:20 art Exp $ machine mvme68k m68k include "../../../conf/GENERIC" -option UVM #option M68030 # support for 030 #option M68040 # support for 040 diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index ba7c9dd5a92..024ba802b47 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.18 2001/05/31 21:05:00 miod Exp $ +# $OpenBSD: GENERIC,v 1.19 2001/06/27 05:46:21 art Exp $ machine mvme88k @@ -8,7 +8,6 @@ option "M88000" # support for 88K option MVME187 # support for 187 option MVME188 # support for 188 #option MVME197 # support for 197 -option UVM # use the UVM virtual memory system option "NCPUS=1" # number of CPUs supported (max 4) option BUGMAP # use the Bug ROM VME mappings #option DEBUG # print debugging statements diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187 index 646107077e9..88a6e1ca137 100644 --- a/sys/arch/mvme88k/conf/M187 +++ b/sys/arch/mvme88k/conf/M187 @@ -1,4 +1,4 @@ -# $OpenBSD: M187,v 1.10 2001/05/31 21:05:00 miod Exp $ +# $OpenBSD: M187,v 1.11 2001/06/27 05:46:21 art Exp $ machine mvme88k @@ -6,7 +6,6 @@ include "../../../conf/GENERIC" option "M88000" # support for 88K option MVME187 # support for 187 -option UVM # use the UVM virtual memory system option "NCPUS=1" # Number of cpus supported (max 4) option BUGMAP # use Bug Rom VME Mappings diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188 index 5dfb196e64f..a41c68d123f 100644 --- a/sys/arch/mvme88k/conf/M188 +++ b/sys/arch/mvme88k/conf/M188 @@ -1,4 +1,4 @@ -# $OpenBSD: M188,v 1.7 2001/05/31 21:05:00 miod Exp $ +# $OpenBSD: M188,v 1.8 2001/06/27 05:46:22 art Exp $ machine mvme88k @@ -8,7 +8,6 @@ include "../../../conf/GENERIC" option "M88000" # support for 88K option MVME188 # support for 187 -option UVM # use the UVM virtual memory system option "NCPUS=1" # Number of cpus supported (max 4) option BUGMAP # use Bug Rom VME Mappings diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197 index 42de31b4d24..de058eb4fcb 100644 --- a/sys/arch/mvme88k/conf/M197 +++ b/sys/arch/mvme88k/conf/M197 @@ -1,4 +1,4 @@ -# $OpenBSD: M197,v 1.5 2001/05/31 21:05:00 miod Exp $ +# $OpenBSD: M197,v 1.6 2001/06/27 05:46:22 art Exp $ machine mvme88k @@ -8,7 +8,6 @@ include "../../../conf/GENERIC" option "M88000" # support for 88K option MVME197 # support for 197 -option UVM option BUGMAP # use Bug Rom VME Mappings maxusers 64 diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK index b35c0d8a54f..96902fd71b8 100644 --- a/sys/arch/mvme88k/conf/RAMDISK +++ b/sys/arch/mvme88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.5 2001/03/07 23:32:40 miod Exp $ +# $OpenBSD: RAMDISK,v 1.6 2001/06/27 05:46:23 art Exp $ machine mvme88k @@ -9,7 +9,6 @@ option MVME187 # support for 187 option MVME188 # support for 188 option MVME197 # support for 197 -option UVM # use the UVM virtual memory system option "NCPUS=1" # number of CPUs supported (max 4) option BUGMAP # use the Bug ROM VME mappings diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC index a8a9651d459..ecaa6999300 100644 --- a/sys/arch/mvmeppc/conf/GENERIC +++ b/sys/arch/mvmeppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.1 2001/06/26 21:57:37 smurph Exp $ +# $OpenBSD: GENERIC,v 1.2 2001/06/27 05:46:23 art Exp $ # # MVMEPPC GENERIC config file # @@ -11,7 +11,6 @@ maxusers 32 # actual machine type probed via name of openfirmware root node. option SYS_TYPE=APPL -option UVM option PCIVERBOSE include "../../../conf/GENERIC" diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK index 06fe720a7a6..0766f3df50c 100644 --- a/sys/arch/mvmeppc/conf/RAMDISK +++ b/sys/arch/mvmeppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.1 2001/06/26 21:57:38 smurph Exp $ +# $OpenBSD: RAMDISK,v 1.2 2001/06/27 05:46:24 art Exp $ # # MVMEPPC GENERIC config file # @@ -11,7 +11,6 @@ maxusers 32 # actual machine type probed via name of openfirmware root node. option SYS_TYPE=APPL -option UVM option PCIVERBOSE include "../../../conf/GENERIC" diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC index f8f94a06dd7..ec488855074 100644 --- a/sys/arch/powerpc/conf/GENERIC +++ b/sys/arch/powerpc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.42 2001/06/26 21:26:44 drahn Exp $ +# $OpenBSD: GENERIC,v 1.43 2001/06/27 05:46:25 art Exp $ # # PPC GENERIC config file # @@ -11,7 +11,6 @@ maxusers 32 # actual machine type probed via name of openfirmware root node. option SYS_TYPE=APPL -option UVM option FIREPOWERBUGS option PPC_MPC106_BUG option PCIVERBOSE diff --git a/sys/arch/powerpc/conf/RAMDISK b/sys/arch/powerpc/conf/RAMDISK index daf8e875bea..255b2b545ad 100644 --- a/sys/arch/powerpc/conf/RAMDISK +++ b/sys/arch/powerpc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.25 2001/06/26 22:03:04 drahn Exp $ +# $OpenBSD: RAMDISK,v 1.26 2001/06/27 05:46:25 art Exp $ # # PPC GENERIC config file # @@ -11,7 +11,6 @@ maxusers 32 # actual machine type probed via name of openfirmware root node. option SYS_TYPE=APPL -option UVM option FIREPOWERBUGS option PPC_MPC106_BUG option PCIVERBOSE diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index fdf16908b49..73455f8a829 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.50 2001/05/10 10:34:40 art Exp $ +# $OpenBSD: GENERIC,v 1.51 2001/06/27 05:46:26 art Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -19,8 +19,6 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc. #option KGDBDEV=0xc01 # kgdb device number (dev_t) #option KGDBRATE=38400 # baud rate -option UVM # use the UVM virtual memory system ; required - # Options for SPARCstation hardware option RASTERCONSOLE # fast rasterop console option COMPAT_SUNOS # compatibility with SunOS binaries diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3 index ca018e2f36d..2b30b8b2717 100644 --- a/sys/arch/sparc/conf/GENERIC_SCSI3 +++ b/sys/arch/sparc/conf/GENERIC_SCSI3 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC_SCSI3,v 1.35 2001/05/10 10:34:40 art Exp $ +# $OpenBSD: GENERIC_SCSI3,v 1.36 2001/06/27 05:46:26 art Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -19,8 +19,6 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc. #option KGDBDEV=0xc01 # kgdb device number (dev_t) #option KGDBRATE=38400 # baud rate -option UVM # use the UVM virtual memory system ; required - # Options for SPARCstation hardware option RASTERCONSOLE # fast rasterop console option COMPAT_SUNOS # compatibility with SunOS binaries diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK index 4e08fd6be49..d8639e01c54 100644 --- a/sys/arch/sparc/conf/RAMDISK +++ b/sys/arch/sparc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.27 2001/06/23 19:46:59 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.28 2001/06/27 05:46:27 art Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -18,7 +18,6 @@ option MINIROOTSIZE=4352 option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC -option UVM # UVM virtual memory system ; required option SMALL_KERNEL option DIAGNOSTIC # internal consistency checks option FFS # UFS diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4 index 7f30d015e31..53bd91b656b 100644 --- a/sys/arch/sparc/conf/SUN4 +++ b/sys/arch/sparc/conf/SUN4 @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4,v 1.23 2001/05/10 10:34:41 art Exp $ +# $OpenBSD: SUN4,v 1.24 2001/06/27 05:46:27 art Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -17,8 +17,6 @@ option RASTERCONSOLE # fast rasterop console option COMPAT_SUNOS # compatibility with SunOS binaries option COMPAT_SVR4 # compatibility with SVR4 binaries -option UVM # use the UVM virtual memory system ; required - maxusers 16 # estimated number of users # Generic swap; second partition of root disk or network. diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index 4fc58d8128d..ab9bbddd589 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4C,v 1.30 2001/05/16 05:07:49 millert Exp $ +# $OpenBSD: SUN4C,v 1.31 2001/06/27 05:46:27 art Exp $ # $NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $ machine sparc @@ -17,8 +17,6 @@ option KTRACE # system call tracing support option RASTERCONSOLE # fast rasterop console option SYSVMSG,SYSVSEM,SYSVSHM -option UVM # use the UVM virtual memory system ; required - # Filesystem options option FFS option NFSSERVER # Sun NFS-compatible filesystem diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M index 79b77a225d8..dc2f54c1908 100644 --- a/sys/arch/sparc/conf/SUN4M +++ b/sys/arch/sparc/conf/SUN4M @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4M,v 1.38 2001/05/10 10:34:41 art Exp $ +# $OpenBSD: SUN4M,v 1.39 2001/06/27 05:46:28 art Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -15,8 +15,6 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc. #option KGDBDEV=0xc01 # kgdb device number (dev_t) #option KGDBRATE=38400 # baud rate -option UVM # use the UVM virtual memory system; required - # Options for SPARCstation hardware option RASTERCONSOLE # fast rasterop console option COMPAT_SUNOS # compatibility with SunOS binaries |