Module Name:    src
Committed By:   maxv
Date:           Fri Aug  4 09:30:19 UTC 2017

Modified Files:
        src/sys/arch/amd64/conf: GENERIC
        src/sys/arch/i386/conf: GENERIC

Log Message:
Revert my changes, and re-enable COMPAT_NOMID, COMPAT_09 and COMPAT_43.
Several compat options happen to be dependent on the compat_43_* functions,
the availability of which is (wrongfully) controlled with COMPAT_43. Same
for COMPAT_09.


To generate a diff of this commit:
cvs rdiff -u -r1.462 -r1.463 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1162 -r1.1163 src/sys/arch/i386/conf/GENERIC

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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.462 src/sys/arch/amd64/conf/GENERIC:1.463
--- src/sys/arch/amd64/conf/GENERIC:1.462	Fri Jul 28 16:10:28 2017
+++ src/sys/arch/amd64/conf/GENERIC	Fri Aug  4 09:30:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.462 2017/07/28 16:10:28 maxv Exp $
+# $NetBSD: GENERIC,v 1.463 2017/08/04 09:30:19 maxv 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.462 $"
+#ident		"GENERIC-$Revision: 1.463 $"
 
 maxusers	64		# estimated number of users
 
@@ -132,7 +132,7 @@ options 	COMPAT_40	# NetBSD 4.0,
 options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
-#options 	COMPAT_43	# and 4.3BSD
+options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
 options 	COMPAT_OSSAUDIO

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1162 src/sys/arch/i386/conf/GENERIC:1.1163
--- src/sys/arch/i386/conf/GENERIC:1.1162	Mon Jul 31 15:43:33 2017
+++ src/sys/arch/i386/conf/GENERIC	Fri Aug  4 09:30:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1162 2017/07/31 15:43:33 maxv Exp $
+# $NetBSD: GENERIC,v 1.1163 2017/08/04 09:30:19 maxv 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.1162 $"
+#ident		"GENERIC-$Revision: 1.1163 $"
 
 maxusers	64		# estimated number of users
 
@@ -124,8 +124,8 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 options 	KDTRACE_HOOKS	# kernel DTrace hooks
 
 # Compatibility options
-#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
-#options 	COMPAT_09	# NetBSD 0.9,
+options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
+options 	COMPAT_09	# NetBSD 0.9,
 options 	COMPAT_10	# NetBSD 1.0,
 options 	COMPAT_11	# NetBSD 1.1,
 options 	COMPAT_12	# NetBSD 1.2 (and 386BSD and BSDI),
@@ -139,7 +139,7 @@ options 	COMPAT_40	# NetBSD 4.0,
 options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
-#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
+options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
 options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility

Reply via email to