Module Name: src
Committed By: snj
Date: Mon Feb 26 01:08:26 UTC 2018
Modified Files:
src/sys/arch/macppc/conf [netbsd-8]: GENERIC GENERIC_601 MAMBO
POWERMAC_G5
Log Message:
Pull up following revision(s) (requested by sevan in ticket #579):
sys/arch/macppc/conf/GENERIC: 1.342
sys/arch/macppc/conf/GENERIC_601: 1.18
sys/arch/macppc/conf/MAMBO: 1.29
sys/arch/macppc/conf/POWERMAC_G5: 1.31
Enable BUFQ_PRIOCSCAN by default for NetBSD/macppc.
Drop references to NEW_BUFQ_STRATEGY and replace with currently available
options BUFQ_READPRIO and BUFQ_PRIOCSCAN.
ok <macallan>
To generate a diff of this commit:
cvs rdiff -u -r1.329.2.3 -r1.329.2.4 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.12.6.1 -r1.12.6.2 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.24.12.2 -r1.24.12.3 src/sys/arch/macppc/conf/MAMBO
cvs rdiff -u -r1.26.8.2 -r1.26.8.3 src/sys/arch/macppc/conf/POWERMAC_G5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.329.2.3 src/sys/arch/macppc/conf/GENERIC:1.329.2.4
--- src/sys/arch/macppc/conf/GENERIC:1.329.2.3 Mon Feb 26 01:04:43 2018
+++ src/sys/arch/macppc/conf/GENERIC Mon Feb 26 01:08:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.329.2.3 2018/02/26 01:04:43 snj Exp $
+# $NetBSD: GENERIC,v 1.329.2.4 2018/02/26 01:08:26 snj 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.329.2.3 $"
+#ident "GENERIC-$Revision: 1.329.2.4 $"
maxusers 32
@@ -49,7 +49,7 @@ options SYSCTL_INCLUDE_DESCR # Include
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
#options BUFQ_READPRIO
-#options BUFQ_PRIOCSCAN
+options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # cheap kernel consistency checks
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.12.6.1 src/sys/arch/macppc/conf/GENERIC_601:1.12.6.2
--- src/sys/arch/macppc/conf/GENERIC_601:1.12.6.1 Fri Jan 26 14:28:14 2018
+++ src/sys/arch/macppc/conf/GENERIC_601 Mon Feb 26 01:08:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.12.6.1 2018/01/26 14:28:14 martin Exp $
+# $NetBSD: GENERIC_601,v 1.12.6.2 2018/02/26 01:08:26 snj Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.12.6.1 $"
+ident "GENERIC-$Revision: 1.12.6.2 $"
maxusers 32
@@ -53,7 +53,7 @@ options SYSCTL_INCLUDE_DESCR # Include
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
#options BUFQ_READPRIO
-#options BUFQ_PRIOCSCAN
+options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options DIAGNOSTIC # cheap kernel consistency checks
Index: src/sys/arch/macppc/conf/MAMBO
diff -u src/sys/arch/macppc/conf/MAMBO:1.24.12.2 src/sys/arch/macppc/conf/MAMBO:1.24.12.3
--- src/sys/arch/macppc/conf/MAMBO:1.24.12.2 Mon Feb 26 01:04:43 2018
+++ src/sys/arch/macppc/conf/MAMBO Mon Feb 26 01:08:26 2018
@@ -6,7 +6,7 @@ include "arch/macppc/conf/std.macppc.g5
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.24.12.2 $"
+#ident "GENERIC-$Revision: 1.24.12.3 $"
maxusers 32
@@ -33,7 +33,8 @@ options SYSCTL_INCLUDE_DESCR # Include
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # cheap kernel consistency checks
Index: src/sys/arch/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.26.8.2 src/sys/arch/macppc/conf/POWERMAC_G5:1.26.8.3
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.26.8.2 Mon Feb 26 01:04:43 2018
+++ src/sys/arch/macppc/conf/POWERMAC_G5 Mon Feb 26 01:08:26 2018
@@ -30,7 +30,8 @@ options SYSCTL_INCLUDE_DESCR # Include
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
-#options NEW_BUFQ_STRATEGY
+#options BUFQ_READPRIO
+options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # cheap kernel consistency checks
