Back out a portion of the last commit. DFLTPHYS and MAXPHYS cannot

    be set by a kernel conf option due to the struct buf structural
    dependancy (sizing of b_pages[]) creating a conflict with modules
    (which are not compiled with kernel config options overrides).

    We'll be able to sysctl these two later on when the buffer subsystem
    is revamped.

6 files changed, 3 insertions, 47 deletions

diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h
index 2bb660c..c09e30c 100644
--- a/sys/alpha/include/param.h
+++ b/sys/alpha/include/param.h
@@ -101,13 +101,8 @@
 #ifndef BLKDEV_IOSIZE
 #define BLKDEV_IOSIZE  PAGE_SIZE	/* default block device I/O size */
 #endif
-
-#ifndef DFLTPHYS
 #define DFLTPHYS	(64 * 1024)	/* default max raw I/O transfer size */
-#endif
-#ifndef MAXPHYS
 #define MAXPHYS		(128 * 1024)	/* max raw I/O transfer size */
-#endif
 
 #define	CLSIZE		1
 #define	CLSIZELOG2	0
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 069b10f..81e4c88 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -60,20 +60,9 @@ options 	DFLDSIZ="(256*1024*1024)"
 # BLKDEV_IOSIZE sets the default block size used in user block
 # device I/O.  Note that this value will be overriden by the label
 # when specifying a block device from a label with a non-0 
-# partition blocksize
-#
-# DFLTPHYS is the default maximum physical I/O transaction size
-# and is used mostly by the clustering code.  It must be a 
-# multiple of the system page size.
-#
-# MAXPHYS is the absolute maximum physical I/O transaction size.
-# It must be a multiple of the system page size.
-#
-# In general you should not modify either DFLTPHYS or MAXPHYS.
+# partition blocksize.  The default is PAGE_SIZE.
 #
 options		BLKDEV_IOSIZE=8192
-options		DFLTPHYS="(64*1024)"
-options		MAXPHYS="(128*1024)"
 
 # Options for the VM subsystem
 #options 	PQ_NOOPT		# No coloring
diff --git a/sys/conf/options b/sys/conf/options
index 3384d378..56bd897 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -289,8 +289,6 @@ INVARIANTS		opt_global.h
 SIMPLELOCK_DEBUG	opt_global.h
 VFS_BIO_DEBUG		opt_global.h
 BLKDEV_IOSIZE		opt_global.h
-DFLTPHYS		opt_global.h
-MAXPHYS			opt_global.h
 
 # These are VM related options
 VM_KMEM_SIZE	opt_vm.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 069b10f..81e4c88 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -60,20 +60,9 @@ options 	DFLDSIZ="(256*1024*1024)"
 # BLKDEV_IOSIZE sets the default block size used in user block
 # device I/O.  Note that this value will be overriden by the label
 # when specifying a block device from a label with a non-0 
-# partition blocksize
-#
-# DFLTPHYS is the default maximum physical I/O transaction size
-# and is used mostly by the clustering code.  It must be a 
-# multiple of the system page size.
-#
-# MAXPHYS is the absolute maximum physical I/O transaction size.
-# It must be a multiple of the system page size.
-#
-# In general you should not modify either DFLTPHYS or MAXPHYS.
+# partition blocksize.  The default is PAGE_SIZE.
 #
 options		BLKDEV_IOSIZE=8192
-options		DFLTPHYS="(64*1024)"
-options		MAXPHYS="(128*1024)"
 
 # Options for the VM subsystem
 #options 	PQ_NOOPT		# No coloring
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 069b10f..81e4c88 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -60,20 +60,9 @@ options 	DFLDSIZ="(256*1024*1024)"
 # BLKDEV_IOSIZE sets the default block size used in user block
 # device I/O.  Note that this value will be overriden by the label
 # when specifying a block device from a label with a non-0 
-# partition blocksize
-#
-# DFLTPHYS is the default maximum physical I/O transaction size
-# and is used mostly by the clustering code.  It must be a 
-# multiple of the system page size.
-#
-# MAXPHYS is the absolute maximum physical I/O transaction size.
-# It must be a multiple of the system page size.
-#
-# In general you should not modify either DFLTPHYS or MAXPHYS.
+# partition blocksize.  The default is PAGE_SIZE.
 #
 options		BLKDEV_IOSIZE=8192
-options		DFLTPHYS="(64*1024)"
-options		MAXPHYS="(128*1024)"
 
 # Options for the VM subsystem
 #options 	PQ_NOOPT		# No coloring
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 0bd98e4..3274938 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -94,12 +94,8 @@
 #ifndef BLKDEV_IOSIZE
 #define BLKDEV_IOSIZE	PAGE_SIZE	/* default block device I/O size */
 #endif
-#ifndef DFLTPHYS
 #define DFLTPHYS	(64 * 1024)	/* default max raw I/O transfer size */
-#endif
-#ifndef MAXPHYS
 #define MAXPHYS		(128 * 1024)	/* max raw I/O transfer size */
-#endif
 
 #define IOPAGES	2		/* pages of i/o permission bitmap */
 #define UPAGES	2		/* pages of u-area */