uvm on the i386

4 files changed, 17 insertions, 6 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8f073217c72..5c1008b047a 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.143 1999/11/30 07:55:55 cmetz Exp $
+#	$OpenBSD: GENERIC,v 1.144 1999/12/01 15:29:57 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -14,6 +14,8 @@ option		I586_CPU
 option		I686_CPU
 option		GPL_MATH_EMULATE	# floating point emulation
 
+option		UVM		# use the UVM virtual memory system
+
 #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/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 325e9759d68..fc3311effae 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.71 1999/11/27 15:55:40 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.72 1999/12/01 15:29:57 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -15,6 +15,8 @@ option		I586_CPU
 option		I686_CPU
 option		GPL_MATH_EMULATE	# floating point emulation
 
+option		UVM		# use the UVM virtual memory system
+
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
@@ -200,9 +202,9 @@ ep*	at pci? dev ? function ?		# 3C59x ethernet cards
 ne*	at pci? dev ? function ?		# NE2000-compat ethernet cards
 ne*	at pcmcia? function ?			# PCMCIA based NE2000 cards
 ep*	at pcmcia? function ?			# PCMCIA based 3c5xx cards
-sm*	at pcmcia? function ?			# PCMCIA based sm cards
+#sm*	at pcmcia? function ?			# PCMCIA based sm cards
 xe*	at pcmcia? function ?			# Xircom ethernet
-wi*	at pcmcia? function ?			# WaveLAN IEEE 802.11
+#wi*	at pcmcia? function ?			# WaveLAN IEEE 802.11
 #fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
 xl*	at pci? dev ? function ?		# 3C9xx ethernet cards
 rl*	at pci? dev ? function ?		# RealTek 81[23]9 ethernet
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 1fb47d6f75f..7e229d085fa 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.7 1999/11/27 15:55:40 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.8 1999/12/01 15:29:57 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -15,6 +15,8 @@ option		I586_CPU
 option		I686_CPU
 option		GPL_MATH_EMULATE	# floating point emulation
 
+option		UVM		# use the UVM virtual memory system
+
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
@@ -119,6 +121,9 @@ pccom*	at isapnp?
 #ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI controllers
 #ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
 #scsibus* at ahc?
+dpt*	at pci? dev ? function ?        # DPT SmartCache/SmartRAID PCI
+dpt*	at eisa? slot ?			# DPT SmartCache/SmartRAID EISA
+scsibus* at dpt?
 isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
 scsibus* at isp?
 #aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index cbbb6d3e96b..ebd248c0289 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.7 1999/11/30 08:42:17 cmetz Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.8 1999/12/01 15:29:57 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -15,6 +15,8 @@ option		I586_CPU
 option		I686_CPU
 option		GPL_MATH_EMULATE	# floating point emulation
 
+option		UVM		# use the UVM virtual memory system
+
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.