Changed swap partition handling/allocation so that it doesn't

require specific partitions be mentioned in the kernel config
file ("swap on foo" is now obsolete).

From Poul-Henning:

The visible effect is this:

As default, unless
        options "NSWAPDEV=23"
is in your config, you will have four swap-devices.
You can swapon(2) any block device you feel like, it doesn't have
to be in the kernel config.

There is a performance/resource win available by getting the NSWAPDEV right
(but only if you have just one swap-device ??), but using that as default
would be too restrictive.

The invisible effect is that:

Swap-handling disappears from the $arch part of the kernel.
It gets a lot simpler (-145 lines) and cleaner.

Reviewed by:	John Dyson, David Greenman
Submitted by:	Poul-Henning Kamp, with minor changes by me.

3 files changed, 12 insertions, 8 deletions

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 2514f78..675c405 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.43 1995/04/24 05:33:58 phk Exp $
+#	$Id: GENERIC,v 1.44 1995/05/02 04:40:06 phk Exp $
 #
 
 machine		"i386"
@@ -23,7 +23,7 @@ options		"SCSI_DELAY=15"		#Be pessimistic about Joe SCSI device
 options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
 options		UCONSOLE		#Allow users to grab the console
 
-config		kernel	root on wd0 swap on wd0 and wd1 and wd2 and wd3 and sd0 and sd1 and vn0 dumps on wd0
+config		kernel	root on wd0 
 
 controller	isa0
 controller	pci0
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index ce8a250..15338e8 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.179 1995/05/11 02:15:37 jkh Exp $
+#	$Id: LINT,v 1.180 1995/05/12 15:17:55 ache Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -58,7 +58,7 @@ options		MATH_EMULATE		#Support for x87 emulation
 #  - The kernel can swap on wd0b and sd0b, defaulting to the former
 #  - Crash dumps will be written to wd0b, if possible
 #
-config		kernel	root on wd0 swap on wd0 and sd0 dumps on wd0
+config		kernel	root on wd0 
 
 
 #####################################################################
@@ -251,7 +251,9 @@ options		UNION			#Union filesystem
 # of kilobytes to reserve for the filesystem.
 options		"MFS_ROOT=10"
 
-#
+# Allow this many swap-devices.
+options		"NSWAPDEV=20"
+
 # Disk quotas are supported when this option is enabled.  If you
 # change the value of this option, you must do a `make clean' in your
 # kernel compile directory in order to get a working kernel.
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index ce8a250..15338e8 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.179 1995/05/11 02:15:37 jkh Exp $
+#	$Id: LINT,v 1.180 1995/05/12 15:17:55 ache Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -58,7 +58,7 @@ options		MATH_EMULATE		#Support for x87 emulation
 #  - The kernel can swap on wd0b and sd0b, defaulting to the former
 #  - Crash dumps will be written to wd0b, if possible
 #
-config		kernel	root on wd0 swap on wd0 and sd0 dumps on wd0
+config		kernel	root on wd0 
 
 
 #####################################################################
@@ -251,7 +251,9 @@ options		UNION			#Union filesystem
 # of kilobytes to reserve for the filesystem.
 options		"MFS_ROOT=10"
 
-#
+# Allow this many swap-devices.
+options		"NSWAPDEV=20"
+
 # Disk quotas are supported when this option is enabled.  If you
 # change the value of this option, you must do a `make clean' in your
 # kernel compile directory in order to get a working kernel.