summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2005-06-09 14:43:29 +0000
committertsutsui <tsutsui@NetBSD.org>2005-06-09 14:43:29 +0000
commit4e54a2cc7c52b7aaaf74ff9e10053cf33b7cd4db (patch)
treece7f65d6251dcc97616309bfbfe2ce9dfffb0305 /sys/arch
parentd05c61ee69174c5a334e6b12f966f40dd80f475c (diff)
- Rename options NEW_BUFQ_STRATEGY -> options BUFQ_READPRIO.
(still commented out) - Add (also commented out) options BUFQ_PRIOCSCAN. Suggested by perry and soda on tech-kern. Please refer options(4) for details for these options.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/acorn26/conf/GENERIC5
-rw-r--r--sys/arch/acorn32/conf/EB7500ATX7
-rw-r--r--sys/arch/acorn32/conf/GENERIC7
-rw-r--r--sys/arch/alpha/conf/ALPHA7
-rw-r--r--sys/arch/alpha/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/GENERIC7
-rw-r--r--sys/arch/amd64/conf/INSTALL7
-rw-r--r--sys/arch/amd64/conf/INSTALL_ACPI7
-rw-r--r--sys/arch/amiga/conf/GENERIC.in7
-rw-r--r--sys/arch/arc/conf/GENERIC7
-rw-r--r--sys/arch/arc/conf/RAMDISK7
-rw-r--r--sys/arch/arc/conf/RPC447
-rw-r--r--sys/arch/atari/conf/GENERIC.in5
-rw-r--r--sys/arch/bebox/conf/GENERIC7
-rw-r--r--sys/arch/cats/conf/GENERIC5
-rw-r--r--sys/arch/cesfic/conf/GENERIC5
-rw-r--r--sys/arch/cobalt/conf/GENERIC7
-rw-r--r--sys/arch/cobalt/conf/INSTALL7
-rw-r--r--sys/arch/evbppc/conf/EXPLORA4515
-rw-r--r--sys/arch/hp300/conf/GENERIC7
-rw-r--r--sys/arch/hp700/conf/GENERIC7
-rw-r--r--sys/arch/hpcsh/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/GENERIC7
-rw-r--r--sys/arch/i386/conf/GENERIC.MPACPI7
-rw-r--r--sys/arch/i386/conf/VIRTUALPC7
-rw-r--r--sys/arch/luna68k/conf/GENERIC7
-rw-r--r--sys/arch/mac68k/conf/GENERIC7
-rw-r--r--sys/arch/macppc/conf/GENERIC7
-rw-r--r--sys/arch/mipsco/conf/GENERIC5
-rw-r--r--sys/arch/mvme68k/conf/GENERIC7
-rw-r--r--sys/arch/netwinder/conf/GENERIC5
-rw-r--r--sys/arch/news68k/conf/GENERIC7
-rw-r--r--sys/arch/news68k/conf/GENERIC_TINY7
-rw-r--r--sys/arch/news68k/conf/LIBERO5
-rw-r--r--sys/arch/newsmips/conf/GENERIC7
-rw-r--r--sys/arch/next68k/conf/GENERIC7
-rw-r--r--sys/arch/pmax/conf/GENERIC7
-rw-r--r--sys/arch/pmax/conf/WSCONS7
-rw-r--r--sys/arch/prep/conf/GENERIC7
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP2x7
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP3x7
-rw-r--r--sys/arch/sparc/conf/GENERIC7
-rw-r--r--sys/arch/sparc/conf/MRCOFFEE7
-rw-r--r--sys/arch/sparc64/conf/GENERIC327
-rw-r--r--sys/arch/sun2/conf/GENERIC7
-rw-r--r--sys/arch/sun3/conf/GENERIC7
-rw-r--r--sys/arch/sun3/conf/GENERIC3X5
-rw-r--r--sys/arch/vax/conf/GENERIC7
-rw-r--r--sys/arch/x68k/conf/GENERIC7
49 files changed, 185 insertions, 136 deletions
diff --git a/sys/arch/acorn26/conf/GENERIC b/sys/arch/acorn26/conf/GENERIC
index f2d97360b87..9dca93cf403 100644
--- a/sys/arch/acorn26/conf/GENERIC
+++ b/sys/arch/acorn26/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.28 2005/02/18 21:05:50 dsl Exp $
+# $NetBSD: GENERIC,v 1.29 2005/06/09 14:43:29 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -140,7 +140,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Disable kernel security.
#options INSECURE
diff --git a/sys/arch/acorn32/conf/EB7500ATX b/sys/arch/acorn32/conf/EB7500ATX
index 870ff5b6354..f648864bbc6 100644
--- a/sys/arch/acorn32/conf/EB7500ATX
+++ b/sys/arch/acorn32/conf/EB7500ATX
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.14 2005/03/11 06:51:48 matt Exp $
+# $NetBSD: EB7500ATX,v 1.15 2005/06/09 14:43:29 tsutsui Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.14 $"
+#ident "EB7500ATX-$Revision: 1.15 $"
# estimated number of users
maxusers 32
@@ -149,7 +149,8 @@ options SYMTAB_SPACE=250000
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Development and Debugging options
diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC
index c3b2b3a312b..557f38596a8 100644
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.52 2005/02/18 21:05:50 dsl Exp $
+# $NetBSD: GENERIC,v 1.53 2005/06/09 14:43:29 tsutsui Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.52 $"
+#ident "GENERIC-$Revision: 1.53 $"
# estimated number of users
maxusers 32
@@ -154,7 +154,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Development and Debugging options
diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA
index 3f04aa42371..f61abb5f011 100644
--- a/sys/arch/alpha/conf/ALPHA
+++ b/sys/arch/alpha/conf/ALPHA
@@ -1,4 +1,4 @@
-# $NetBSD: ALPHA,v 1.205 2005/05/31 22:23:52 tron Exp $
+# $NetBSD: ALPHA,v 1.206 2005/06/09 14:43:29 tsutsui Exp $
#
# Alpha kernel with all the options you'd want, and more.
@@ -6,7 +6,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "ALPHA-$Revision: 1.205 $"
+ident "ALPHA-$Revision: 1.206 $"
maxusers 32
@@ -38,7 +38,8 @@ options NTP # kernel PLL for NTP
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # Cheap kernel consistency checks
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 906d1d499a8..10608226844 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -22,7 +22,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.264 $"
+#ident "GENERIC-$Revision: 1.265 $"
maxusers 32
@@ -54,7 +54,8 @@ options NTP # kernel PLL for NTP
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # Cheap kernel consistency checks
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8574c8637d4..6e4757be773 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.46 2005/04/15 17:27:21 itohy Exp $
+# $NetBSD: GENERIC,v 1.47 2005/06/09 14:43:29 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.46 $"
+#ident "GENERIC-$Revision: 1.47 $"
maxusers 32 # estimated number of users
@@ -72,7 +72,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/amd64/conf/INSTALL b/sys/arch/amd64/conf/INSTALL
index 0fc1e6564a5..d10bab7bfb3 100644
--- a/sys/arch/amd64/conf/INSTALL
+++ b/sys/arch/amd64/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.31 2005/04/15 17:27:21 itohy Exp $
+# $NetBSD: INSTALL,v 1.32 2005/06/09 14:43:29 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/amd64/conf/std.amd64"
-#ident "INSTALL-$Revision: 1.31 $"
+#ident "INSTALL-$Revision: 1.32 $"
maxusers 32 # estimated number of users
@@ -53,7 +53,8 @@ options USERCONF # userconf(4) support
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/amd64/conf/INSTALL_ACPI b/sys/arch/amd64/conf/INSTALL_ACPI
index c7b31db2654..fc945891206 100644
--- a/sys/arch/amd64/conf/INSTALL_ACPI
+++ b/sys/arch/amd64/conf/INSTALL_ACPI
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_ACPI,v 1.22 2005/04/15 17:27:21 itohy Exp $
+# $NetBSD: INSTALL_ACPI,v 1.23 2005/06/09 14:43:29 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/amd64/conf/std.amd64"
-#ident "INSTALL-$Revision: 1.22 $"
+#ident "INSTALL-$Revision: 1.23 $"
maxusers 32 # estimated number of users
@@ -53,7 +53,8 @@ options USERCONF # userconf(4) support
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/amiga/conf/GENERIC.in b/sys/arch/amiga/conf/GENERIC.in
index 3c98c54c17f..2e2f8ee63be 100644
--- a/sys/arch/amiga/conf/GENERIC.in
+++ b/sys/arch/amiga/conf/GENERIC.in
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.35 2005/06/01 18:55:08 jandberg Exp $
+# $NetBSD: GENERIC.in,v 1.36 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -56,7 +56,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.35 $"
+#ident "GENERIC-$Revision: 1.36 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -242,7 +242,8 @@ options NTP # NTP phase/frequency locked loop
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
#
# Misc. debugging options
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 315385fa4e5..95aeb25c7f3 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.114 2005/05/31 22:23:52 tron Exp $
+# $NetBSD: GENERIC,v 1.115 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.114 $"
+#ident "GENERIC-$Revision: 1.115 $"
maxusers 32 # estimated number of users
@@ -65,7 +65,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # cheap kernel consistency checks
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index 2ddf4ac185a..0bafc5e0f39 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.57 2005/05/31 22:23:52 tron Exp $
+# $NetBSD: RAMDISK,v 1.58 2005/06/09 14:43:30 tsutsui Exp $
#
# memory disk based configuration file for MIPS R4x00 ARC Systems
#
@@ -7,7 +7,7 @@ include "arch/arc/conf/std.arc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.57 $"
+#ident "GENERIC-$Revision: 1.58 $"
maxusers 32 # estimated number of users
@@ -49,7 +49,8 @@ options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # cheap kernel consistency checks
diff --git a/sys/arch/arc/conf/RPC44 b/sys/arch/arc/conf/RPC44
index 33b0ea0e777..7ae458cd053 100644
--- a/sys/arch/arc/conf/RPC44
+++ b/sys/arch/arc/conf/RPC44
@@ -1,4 +1,4 @@
-# $NetBSD: RPC44,v 1.14 2005/02/18 21:05:51 dsl Exp $
+# $NetBSD: RPC44,v 1.15 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.14 $"
+#ident "GENERIC-$Revision: 1.15 $"
maxusers 32 # estimated number of users
@@ -54,7 +54,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # cheap kernel consistency checks
diff --git a/sys/arch/atari/conf/GENERIC.in b/sys/arch/atari/conf/GENERIC.in
index be94f989244..d555b2ed3e1 100644
--- a/sys/arch/atari/conf/GENERIC.in
+++ b/sys/arch/atari/conf/GENERIC.in
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.47 2005/02/25 13:46:48 simonb Exp $
+# $NetBSD: GENERIC.in,v 1.48 2005/06/09 14:43:30 tsutsui Exp $
#
# Generic atari
#
@@ -28,7 +28,8 @@ options INSECURE # disable kernel security levels
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
#
# (Co)processors this kernel should support
diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC
index 9f8a339ae02..c43042a44ce 100644
--- a/sys/arch/bebox/conf/GENERIC
+++ b/sys/arch/bebox/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.81 2005/03/25 23:28:44 cube Exp $
+# $NetBSD: GENERIC,v 1.82 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.81 $"
+#ident "GENERIC-$Revision: 1.82 $"
maxusers 32
@@ -46,7 +46,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_43
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index e0c714a019b..be8763e4b67 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.81 2005/06/03 23:28:40 chris Exp $
+# $NetBSD: GENERIC,v 1.82 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -39,7 +39,8 @@ options NTP # NTP phase/frequency locked loop
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# CPU options
diff --git a/sys/arch/cesfic/conf/GENERIC b/sys/arch/cesfic/conf/GENERIC
index fa3cd8771f9..ff693b890d9 100644
--- a/sys/arch/cesfic/conf/GENERIC
+++ b/sys/arch/cesfic/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.29 2005/02/25 13:46:49 simonb Exp $
+# $NetBSD: GENERIC,v 1.30 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -36,7 +36,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_43 # compatibility with 4.3BSD interfaces
diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC
index ba8aebc5b9b..e6087e62c4f 100644
--- a/sys/arch/cobalt/conf/GENERIC
+++ b/sys/arch/cobalt/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.72 2005/05/31 22:23:52 tron Exp $
+# $NetBSD: GENERIC,v 1.73 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.72 $"
+#ident "GENERIC-$Revision: 1.73 $"
maxusers 32
@@ -46,7 +46,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
options DIAGNOSTIC # extra kernel sanity checking
diff --git a/sys/arch/cobalt/conf/INSTALL b/sys/arch/cobalt/conf/INSTALL
index 94fb1d5e590..21385c278e8 100644
--- a/sys/arch/cobalt/conf/INSTALL
+++ b/sys/arch/cobalt/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.6 2005/05/31 22:23:52 tron Exp $
+# $NetBSD: INSTALL,v 1.7 2005/06/09 14:43:30 tsutsui Exp $
#
# INSTALL -- installation and rescue kernel.
#
@@ -10,7 +10,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
makeoptions COPTS="-Os"
@@ -36,7 +36,8 @@ options USERCONF # userconf(4) support
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
#options DIAGNOSTIC # extra kernel sanity checking
diff --git a/sys/arch/evbppc/conf/EXPLORA451 b/sys/arch/evbppc/conf/EXPLORA451
index 3a43e859ea0..73d31bd84d2 100644
--- a/sys/arch/evbppc/conf/EXPLORA451
+++ b/sys/arch/evbppc/conf/EXPLORA451
@@ -1,4 +1,4 @@
-# $NetBSD: EXPLORA451,v 1.12 2005/02/25 13:46:49 simonb Exp $
+# $NetBSD: EXPLORA451,v 1.13 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -44,7 +44,8 @@ options USERCONF # userconf(4) support
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 0d13bee755a..6fa23675a06 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.113 2005/02/18 21:05:51 dsl Exp $
+# $NetBSD: GENERIC,v 1.114 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.113 $"
+#ident "GENERIC-$Revision: 1.114 $"
maxusers 32 # estimated number of users
@@ -64,7 +64,8 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
options DIAGNOSTIC # Extra kernel sanity checks
diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC
index 1cb4ee77a1f..f497fe2ae68 100644
--- a/sys/arch/hp700/conf/GENERIC
+++ b/sys/arch/hp700/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.45 2005/05/31 22:23:53 tron Exp $
+# $NetBSD: GENERIC,v 1.46 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.45 $"
+#ident "GENERIC-$Revision: 1.46 $"
maxusers 32 # estimated number of users
@@ -69,7 +69,8 @@ options LKM # loadable kernel modules
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/hpcsh/conf/GENERIC b/sys/arch/hpcsh/conf/GENERIC
index 135e22d147c..35ba8c6a034 100644
--- a/sys/arch/hpcsh/conf/GENERIC
+++ b/sys/arch/hpcsh/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.48 2005/05/23 17:44:25 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.49 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -85,7 +85,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Likely stable but not yet the default.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e6cfc4044e8..4226616acb9 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.673 2005/05/17 17:20:41 hubertf Exp $
+# $NetBSD: GENERIC,v 1.674 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.673 $"
+#ident "GENERIC-$Revision: 1.674 $"
maxusers 32 # estimated number of users
@@ -102,7 +102,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Likely stable but not yet the default.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/i386/conf/GENERIC.MPACPI b/sys/arch/i386/conf/GENERIC.MPACPI
index 1775ad234e1..743d79ddbec 100644
--- a/sys/arch/i386/conf/GENERIC.MPACPI
+++ b/sys/arch/i386/conf/GENERIC.MPACPI
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.MPACPI,v 1.27 2005/05/17 17:20:41 hubertf Exp $
+# $NetBSD: GENERIC.MPACPI,v 1.28 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC.MPACPI -- Generic, plus ACPI Multiprocessor support
#
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.27 $"
+#ident "GENERIC-$Revision: 1.28 $"
maxusers 32 # estimated number of users
@@ -91,7 +91,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Likely stable but not yet the default.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/i386/conf/VIRTUALPC b/sys/arch/i386/conf/VIRTUALPC
index 30a57dea45c..0914935a844 100644
--- a/sys/arch/i386/conf/VIRTUALPC
+++ b/sys/arch/i386/conf/VIRTUALPC
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTUALPC,v 1.20 2005/04/15 17:27:21 itohy Exp $
+# $NetBSD: VIRTUALPC,v 1.21 2005/06/09 14:43:30 tsutsui Exp $
#
# VIRTUALPC machine description file --
#
@@ -11,7 +11,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "VIRTUALPC-$Revision: 1.20 $"
+#ident "VIRTUALPC-$Revision: 1.21 $"
maxusers 32 # estimated number of users
@@ -87,7 +87,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/luna68k/conf/GENERIC b/sys/arch/luna68k/conf/GENERIC
index fd96f24c9b5..89bc51737cb 100644
--- a/sys/arch/luna68k/conf/GENERIC
+++ b/sys/arch/luna68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.56 2005/02/25 13:46:50 simonb Exp $
+# $NetBSD: GENERIC,v 1.57 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.56 $"
+#ident "GENERIC-$Revision: 1.57 $"
maxusers 8
@@ -52,7 +52,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
options DDB
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 008d5401518..963cf37ffec 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.156 2005/02/25 13:46:50 simonb Exp $
+# $NetBSD: GENERIC,v 1.157 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mac68k/conf/std.mac68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.156 $"
+#ident "GENERIC-$Revision: 1.157 $"
maxusers 16 # estimated number of users
@@ -63,7 +63,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # cheap kernel consistency checks
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 70f3a4b0510..43fed64a3c4 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.198 2005/06/06 10:39:11 tron Exp $
+# $NetBSD: GENERIC,v 1.199 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.198 $"
+#ident "GENERIC-$Revision: 1.199 $"
maxusers 32
@@ -54,7 +54,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # cheap kernel consistency checks
diff --git a/sys/arch/mipsco/conf/GENERIC b/sys/arch/mipsco/conf/GENERIC
index a2ac73ff410..f06bc77094c 100644
--- a/sys/arch/mipsco/conf/GENERIC
+++ b/sys/arch/mipsco/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.44 2005/02/25 13:46:50 simonb Exp $
+# $NetBSD: GENERIC,v 1.45 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -47,7 +47,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
options DDB # kernel dynamic debugger
diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index 10ac7d0d3ba..5e2c41cfa40 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.54 2005/02/25 13:46:50 simonb Exp $
+# $NetBSD: GENERIC,v 1.55 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mvme68k/conf/std.mvme68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.54 $"
+#ident "GENERIC-$Revision: 1.55 $"
# Boards this kernel supports
options MVME147
@@ -53,7 +53,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
file-system FFS
file-system NFS
diff --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC
index d4a0edad36a..886ce378684 100644
--- a/sys/arch/netwinder/conf/GENERIC
+++ b/sys/arch/netwinder/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.60 2005/03/11 07:07:50 matt Exp $
+# $NetBSD: GENERIC,v 1.61 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -33,7 +33,8 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# CPU options
diff --git a/sys/arch/news68k/conf/GENERIC b/sys/arch/news68k/conf/GENERIC
index d02200f0266..d419e8bce45 100644
--- a/sys/arch/news68k/conf/GENERIC
+++ b/sys/arch/news68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.62 2005/02/18 21:05:53 dsl Exp $
+# $NetBSD: GENERIC,v 1.63 2005/06/09 14:43:30 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/news68k/conf/std.news68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.62 $"
+#ident "GENERIC-$Revision: 1.63 $"
maxusers 8
@@ -51,7 +51,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
#options DIAGNOSTIC # extra kernel sanity checking
diff --git a/sys/arch/news68k/conf/GENERIC_TINY b/sys/arch/news68k/conf/GENERIC_TINY
index fc317158039..a2c2d02d0a4 100644
--- a/sys/arch/news68k/conf/GENERIC_TINY
+++ b/sys/arch/news68k/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.36 2005/02/18 21:05:53 dsl Exp $
+# $NetBSD: GENERIC_TINY,v 1.37 2005/06/09 14:43:30 tsutsui Exp $
# news68k GENERIC config file for low memory machines;
#
@@ -6,7 +6,7 @@ include "arch/news68k/conf/std.news68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC_TINY-$Revision: 1.36 $"
+#ident "GENERIC_TINY-$Revision: 1.37 $"
maxusers 4
@@ -36,7 +36,8 @@ options MALLOC_NOINLINE # Not inlining MALLOC saves memory
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
#options DIAGNOSTIC # extra kernel sanity checking
diff --git a/sys/arch/news68k/conf/LIBERO b/sys/arch/news68k/conf/LIBERO
index 6805cc4bf19..02c885fd66e 100644
--- a/sys/arch/news68k/conf/LIBERO
+++ b/sys/arch/news68k/conf/LIBERO
@@ -1,4 +1,4 @@
-# $NetBSD: LIBERO,v 1.29 2005/02/18 21:05:53 dsl Exp $
+# $NetBSD: LIBERO,v 1.30 2005/06/09 14:43:30 tsutsui Exp $
# NEWS1750 config file;
#
@@ -29,7 +29,8 @@ options LKM # loadable kernel modules
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
options DDB # kernel dynamic debugger
diff --git a/sys/arch/newsmips/conf/GENERIC b/sys/arch/newsmips/conf/GENERIC
index e41ddb78bdf..da48808a975 100644
--- a/sys/arch/newsmips/conf/GENERIC
+++ b/sys/arch/newsmips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.76 2005/02/18 21:05:53 dsl Exp $
+# $NetBSD: GENERIC,v 1.77 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/newsmips/conf/std.newsmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.76 $"
+#ident "GENERIC-$Revision: 1.77 $"
maxusers 16
@@ -52,7 +52,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Debugging options
options DDB # kernel dynamic debugger
diff --git a/sys/arch/next68k/conf/GENERIC b/sys/arch/next68k/conf/GENERIC
index aee9be566a7..3877266c696 100644
--- a/sys/arch/next68k/conf/GENERIC
+++ b/sys/arch/next68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.86 2005/02/25 13:46:50 simonb Exp $
+# $NetBSD: GENERIC,v 1.87 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/next68k/conf/std.next68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.86 $"
+#ident "GENERIC-$Revision: 1.87 $"
# Needs to be set per system. i.e change these as you see fit
maxusers 16
@@ -48,7 +48,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
options DEBUG # kernel debugging code
options DIAGNOSTIC # extra kernel sanity checking
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 3a60ff7915e..13b791a3883 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.127 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: GENERIC,v 1.128 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/pmax/conf/files.pmax_rcons"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.127 $"
+#ident "GENERIC-$Revision: 1.128 $"
maxusers 64
@@ -71,7 +71,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
#options SCSIVERBOSE # Verbose SCSI errors
#options TCVERBOSE # recognize "unknown" TC devices
diff --git a/sys/arch/pmax/conf/WSCONS b/sys/arch/pmax/conf/WSCONS
index 94eaeb8638f..3d4f81876bd 100644
--- a/sys/arch/pmax/conf/WSCONS
+++ b/sys/arch/pmax/conf/WSCONS
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.11 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: WSCONS,v 1.12 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -33,7 +33,7 @@ options WSCONS
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.11 $"
+#ident "GENERIC-$Revision: 1.12 $"
maxusers 64
@@ -80,7 +80,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
#options SCSIVERBOSE # Verbose SCSI errors
#options TCVERBOSE # recognize "unknown" TC devices
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index 994e16766a6..a64e6a8f4a8 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.92 2005/04/15 17:27:21 itohy Exp $
+# $NetBSD: GENERIC,v 1.93 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
makeoptions COPTS="-Os -mmultiple" # -Os -mmultiple to reduce size.
-#ident "GENERIC-$Revision: 1.92 $"
+#ident "GENERIC-$Revision: 1.93 $"
maxusers 32
@@ -64,7 +64,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # cheap kernel consistency checks
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP2x b/sys/arch/sgimips/conf/GENERIC32_IP2x
index 32c9cdec199..407008a3532 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP2x,v 1.30 2005/02/18 21:05:53 dsl Exp $
+# $NetBSD: GENERIC32_IP2x,v 1.31 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.30 $"
+#ident "GENERIC32-IP2x-$Revision: 1.31 $"
maxusers 32
@@ -70,7 +70,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x
index 77be9d47e5e..b9cce5f49d8 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.24 2005/04/15 17:27:21 itohy Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.25 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.24 $"
+#ident "GENERIC32_IP3x-$Revision: 1.25 $"
maxusers 32
@@ -62,7 +62,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 94c521e90a8..f2f15fb6b17 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.169 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: GENERIC,v 1.170 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.169 $"
+#ident "GENERIC-$Revision: 1.170 $"
maxusers 32
@@ -91,7 +91,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
options NFS_BOOT_BOOTPARAM
diff --git a/sys/arch/sparc/conf/MRCOFFEE b/sys/arch/sparc/conf/MRCOFFEE
index e21b8392725..5eb19d68078 100644
--- a/sys/arch/sparc/conf/MRCOFFEE
+++ b/sys/arch/sparc/conf/MRCOFFEE
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.7 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: MRCOFFEE,v 1.8 2005/06/09 14:43:31 tsutsui Exp $
# From: NetBSD: GENERIC,v 1.160 2004/07/10 12:05:35 uwe Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.7 $"
+#ident "MRCOFFEE-$Revision: 1.8 $"
maxusers 32
@@ -78,7 +78,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
options NFS_BOOT_BOOTPARAM
diff --git a/sys/arch/sparc64/conf/GENERIC32 b/sys/arch/sparc64/conf/GENERIC32
index ad7bf0c1ae0..53f52c3086a 100644
--- a/sys/arch/sparc64/conf/GENERIC32
+++ b/sys/arch/sparc64/conf/GENERIC32
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC32,v 1.106 2005/06/01 12:58:13 macallan Exp $
+# $NetBSD: GENERIC32,v 1.107 2005/06/09 14:43:31 tsutsui Exp $
include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.106 $"
+#ident "GENERIC-$Revision: 1.107 $"
maxusers 64
@@ -56,7 +56,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
options NFS_BOOT_BOOTPARAM
diff --git a/sys/arch/sun2/conf/GENERIC b/sys/arch/sun2/conf/GENERIC
index 07d4884c436..291a8e28104 100644
--- a/sys/arch/sun2/conf/GENERIC
+++ b/sys/arch/sun2/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.39 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: GENERIC,v 1.40 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun2/conf/std.sun2"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.39 $"
+#ident "GENERIC-$Revision: 1.40 $"
# Machines to be supported by this kernel
#options FPU_EMULATE
@@ -53,7 +53,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Which kernel debugger? Uncomment either this:
options DDB
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index 33b098f2bb9..7e0023f86dc 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.114 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: GENERIC,v 1.115 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.114 $"
+#ident "GENERIC-$Revision: 1.115 $"
# Machines to be supported by this kernel
options FPU_EMULATE
@@ -54,7 +54,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Which kernel debugger? Uncomment either this:
options DDB
diff --git a/sys/arch/sun3/conf/GENERIC3X b/sys/arch/sun3/conf/GENERIC3X
index 0e2876bc027..c2e4191d36a 100644
--- a/sys/arch/sun3/conf/GENERIC3X
+++ b/sys/arch/sun3/conf/GENERIC3X
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.72 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: GENERIC3X,v 1.73 2005/06/09 14:43:31 tsutsui Exp $
# GENERIC Sun3X (3/80, 3/470)
# Supports root on: ie0, le0, sd*, ...
@@ -34,7 +34,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Which kernel debugger? Uncomment either this:
options DDB
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index d319aafd241..45f250699b7 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.132 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: GENERIC,v 1.133 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.132 $"
+#ident "GENERIC-$Revision: 1.133 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -159,7 +159,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
# Kernel(s) to compile
config netbsd root on ? type ?
diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC
index b3198fc427b..c9280eec591 100644
--- a/sys/arch/x68k/conf/GENERIC
+++ b/sys/arch/x68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.110 2005/04/15 17:27:21 itohy Exp $
+# $NetBSD: GENERIC,v 1.111 2005/06/09 14:43:31 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.110 $"
+#ident "GENERIC-$Revision: 1.111 $"
maxusers 8
@@ -93,7 +93,8 @@ options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+#options BUFQ_PRIOCSCAN
## NFS boot options; not supported currently: needs nfsboot program
#options NFS_BOOT_BOOTPARAM