FFS_SOFTUPDATES in sys/conf/GENERIC

11 files changed, 12 insertions, 26 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index c90db7f29ee..9d2494c567d 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.69 2001/03/19 05:12:03 nate Exp $
+#	$OpenBSD: GENERIC,v 1.70 2001/04/09 20:40:50 deraadt 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.
@@ -22,8 +22,6 @@ option		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 option		DEC_550		# Miata:	Digital Personal Workstation
 option		DEC_6600	# EV6:		264DP OEM Board
 
-option		FFS_SOFTUPDATES	# Soft updates
-
 option		COMPAT_OSF1	# OSF/1 binary compatibility
 option		COMPAT_NETBSD	# NetBSD compatibility
 
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 2244cf57f7e..49e16060e43 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKBIG,v 1.5 2001/03/08 03:37:16 itojun Exp $
+#	$OpenBSD: RAMDISKBIG,v 1.6 2001/04/09 20:40:50 deraadt 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.
@@ -22,8 +22,6 @@ option		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 option		DEC_550		# Miata:	Digital Personal Workstation
 option		DEC_6600	# EV6:		264DP OEM Board
 
-#option		FFS_SOFTUPDATES	# Soft updates
-
 #option		COMPAT_OSF1	# OSF/1 binary compatibility
 #option		COMPAT_NETBSD	# NetBSD compatibility
 
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 52e0b995b88..fdbf1fdeccb 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.29 2001/02/28 18:30:24 todd Exp $
+#	$OpenBSD: DISKLESS,v 1.30 2001/04/09 20:40:50 deraadt Exp $
 #	$NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
@@ -53,8 +53,6 @@ option		SYSVSHM		# System V-like memory sharing
 
 option		UVM_SWAP_ENCRYPT# support encryption of pages going to swap
 
-option		FFS_SOFTUPDATES	# Soft updates
-
 option		COMPAT_09	# Kernel compatibility with NetBSD 0.9,
 option		COMPAT_10	# NetBSD 1.0,
 option		COMPAT_11	# NetBSD 1.1,
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 516489bb4ef..6e9125aeb2b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.250 2001/03/29 14:20:45 aaron Exp $
+#	$OpenBSD: GENERIC,v 1.251 2001/04/09 20:40:51 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -26,8 +26,6 @@ option		APERTURE	# in-kernel aperture driver for XFree86
 
 #option		DUMMY_NOPS	# speed hack; recommended
 
-option		FFS_SOFTUPDATES	# Soft updates
-
 option		COMPAT_SVR4	# binary compatibility with SVR4
 option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
 option		COMPAT_LINUX	# binary compatibility with Linux
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 26b89f8a9f9..932a6fc783a 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.16 2001/03/08 03:37:18 itojun Exp $
+#	$OpenBSD: GENERIC,v 1.17 2001/04/09 20:40:51 deraadt 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		FFS_SOFTUPDATES	# Soft Updates
 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 5febdd8c762..1604236d787 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,4 +1,4 @@
-#	$OpenBSD: M187,v 1.8 2001/03/08 03:37:18 itojun Exp $
+#	$OpenBSD: M187,v 1.9 2001/04/09 20:40:51 deraadt Exp $
 
 machine mvme88k
 
@@ -7,7 +7,6 @@ include "../../../conf/GENERIC"
 option		"M88000"	# support for 88K
 option		MVME187		# support for 187
 option		UVM		# use the UVM virtual memory system
-option		FFS_SOFTUPDATES	# Soft Updates
 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 1d276dfa0fe..bcb5c1f8114 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,4 +1,4 @@
-#	$OpenBSD: M188,v 1.5 2001/03/08 03:37:18 itojun Exp $
+#	$OpenBSD: M188,v 1.6 2001/04/09 20:40:51 deraadt Exp $
 
 machine mvme88k
 
@@ -9,7 +9,6 @@ include "../../../conf/GENERIC"
 option		"M88000"	# support for 88K
 option		MVME188		# support for 187
 option		UVM		# use the UVM virtual memory system
-option		FFS_SOFTUPDATES	# Soft Updates
 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 110bb6ad98e..8afdc5616b3 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,4 +1,4 @@
-#	$OpenBSD: M197,v 1.3 2001/03/08 03:37:18 itojun Exp $
+#	$OpenBSD: M197,v 1.4 2001/04/09 20:40:51 deraadt Exp $
 
 machine mvme88k
 
@@ -9,7 +9,6 @@ include "../../../conf/GENERIC"
 option		"M88000"	# support for 88K
 option 		MVME197		# support for 197
 option		UVM
-option		FFS_SOFTUPDATES	# Soft Updates
 option		BUGMAP		# use Bug Rom VME Mappings
 
 maxusers 64
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 50d9434ec87..676b8fef156 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.30 2001/03/30 00:16:50 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.31 2001/04/09 20:40:51 deraadt Exp $
 #
 # PPC GENERIC config file
 #
@@ -17,7 +17,6 @@ option		PPC_MPC106_BUG
 option		PCIVERBOSE
 option		USBVERBOSE
 option		WSEMUL_NO_DUMB
-option 		FFS_SOFTUPDATES
 
 include "../../../conf/GENERIC"
 
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 578f40bf583..af4e140df70 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.23 2001/04/09 19:41:40 hugh Exp $
+#	$OpenBSD: GENERIC,v 1.24 2001/04/09 20:40:52 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.61 2000/04/19 06:50:36 itojun Exp $
 
 machine 	vax			# machine type; required
@@ -34,8 +34,6 @@ option		SCSIVERBOSE	# Verbose SCSI errors
 option		WSEMUL_VT100
 option		WSDISPLAY_DEFAULTSCREENS=8
 
-option		FFS_SOFTUPDATES	# Soft updates
-
 # Old compat stuff; needed to run 4.3BSD Reno programs.
 # Note that if COMPAT_ULTRIX is set, you lose compatibility with
 # 4.3BSD Reno programs and get Ultrix compatibility instead.
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index a8efd9ee84d..508b085249b 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.70 2001/04/09 10:29:59 art Exp $
+#	$OpenBSD: GENERIC,v 1.71 2001/04/09 20:40:49 deraadt Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -38,6 +38,7 @@ option		COMPAT_43	# and 4.3BSD
 option		LKM		# loadable kernel modules
 
 option		FFS		# UFS
+option		FFS_SOFTUPDATES	# Soft updates
 option		QUOTA		# UFS quotas
 option		EXT2FS		# Second Extended Filesystem
 option		MFS		# memory file system