5 files changed, 46 insertions, 5 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 01bf777e24f6..bd761dee5bb8 100644
--- a/sys/conf/NOTES
+++ b/sys/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.281 1996/10/01 03:00:30 pst Exp $
+#	$Id: LINT,v 1.282 1996/10/05 11:01:24 jkh 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
@@ -79,6 +79,13 @@ options		FAILSAFE
 # It will become the default after some testing period.
 options		"I586_FAST_BCOPY"
 
+# This is like I586_FAST_BCOPY except it actually controls bcopy().
+# It is a separate option because the code for it is newer.
+options		"I586_OPTIMIZED_BCOPY"
+
+# This is like I586_OPTIMIZED_BCOPY except it controls bzero().
+options		"I586_OPTIMIZED_BZERO"
+
 #
 # This directive defines a number of things:
 #  - The compiled kernel is to be called `kernel'
@@ -967,10 +974,14 @@ options		POWERFAIL_NMI	# make it beep instead of panicing
 
 # More undocumented options for linting.
 
+options		CLK_CALIBRATION_LOOP
+options		"CLK_USE_I8254_CALIBRATION"
+options		"CLK_USE_I586_CALIBRATION"
 options		DEBUG
 options		"EXT2FS"
 options		"IBCS2"
 options		COMPAT_LINUX
 options		"SCSI_2_DEF"
 options		SHOW_BUSYBUFS	# List buffers that prevent root unmount
+options		SI_DEBUG
 options		SPX_HACK
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 2369dad7688b..023028583b82 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.20 1996/10/02 03:48:09 pst Exp $
+#	$Id: options.i386,v 1.21 1996/10/05 10:43:55 jkh Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
@@ -30,6 +30,10 @@ CLK_CALIBRATION_LOOP	  opt_clock.h
 CLK_USE_I8254_CALIBRATION opt_clock.h
 CLK_USE_I586_CALIBRATION  opt_clock.h
 
+I586_FAST_BCOPY		opt_temporary.h
+I586_OPTIMIZED_BCOPY	opt_temporary.h
+I586_OPTIMIZED_BZERO	opt_temporary.h
+
 SC_KBD_PROBE_WORKS	opt_syscons.h
 SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 01bf777e24f6..bd761dee5bb8 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.281 1996/10/01 03:00:30 pst Exp $
+#	$Id: LINT,v 1.282 1996/10/05 11:01:24 jkh 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
@@ -79,6 +79,13 @@ options		FAILSAFE
 # It will become the default after some testing period.
 options		"I586_FAST_BCOPY"
 
+# This is like I586_FAST_BCOPY except it actually controls bcopy().
+# It is a separate option because the code for it is newer.
+options		"I586_OPTIMIZED_BCOPY"
+
+# This is like I586_OPTIMIZED_BCOPY except it controls bzero().
+options		"I586_OPTIMIZED_BZERO"
+
 #
 # This directive defines a number of things:
 #  - The compiled kernel is to be called `kernel'
@@ -967,10 +974,14 @@ options		POWERFAIL_NMI	# make it beep instead of panicing
 
 # More undocumented options for linting.
 
+options		CLK_CALIBRATION_LOOP
+options		"CLK_USE_I8254_CALIBRATION"
+options		"CLK_USE_I586_CALIBRATION"
 options		DEBUG
 options		"EXT2FS"
 options		"IBCS2"
 options		COMPAT_LINUX
 options		"SCSI_2_DEF"
 options		SHOW_BUSYBUFS	# List buffers that prevent root unmount
+options		SI_DEBUG
 options		SPX_HACK
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 01bf777e24f6..bd761dee5bb8 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.281 1996/10/01 03:00:30 pst Exp $
+#	$Id: LINT,v 1.282 1996/10/05 11:01:24 jkh 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
@@ -79,6 +79,13 @@ options		FAILSAFE
 # It will become the default after some testing period.
 options		"I586_FAST_BCOPY"
 
+# This is like I586_FAST_BCOPY except it actually controls bcopy().
+# It is a separate option because the code for it is newer.
+options		"I586_OPTIMIZED_BCOPY"
+
+# This is like I586_OPTIMIZED_BCOPY except it controls bzero().
+options		"I586_OPTIMIZED_BZERO"
+
 #
 # This directive defines a number of things:
 #  - The compiled kernel is to be called `kernel'
@@ -967,10 +974,14 @@ options		POWERFAIL_NMI	# make it beep instead of panicing
 
 # More undocumented options for linting.
 
+options		CLK_CALIBRATION_LOOP
+options		"CLK_USE_I8254_CALIBRATION"
+options		"CLK_USE_I586_CALIBRATION"
 options		DEBUG
 options		"EXT2FS"
 options		"IBCS2"
 options		COMPAT_LINUX
 options		"SCSI_2_DEF"
 options		SHOW_BUSYBUFS	# List buffers that prevent root unmount
+options		SI_DEBUG
 options		SPX_HACK
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 2369dad7688b..023028583b82 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.20 1996/10/02 03:48:09 pst Exp $
+#	$Id: options.i386,v 1.21 1996/10/05 10:43:55 jkh Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
@@ -30,6 +30,10 @@ CLK_CALIBRATION_LOOP	  opt_clock.h
 CLK_USE_I8254_CALIBRATION opt_clock.h
 CLK_USE_I586_CALIBRATION  opt_clock.h
 
+I586_FAST_BCOPY		opt_temporary.h
+I586_OPTIMIZED_BCOPY	opt_temporary.h
+I586_OPTIMIZED_BZERO	opt_temporary.h
+
 SC_KBD_PROBE_WORKS	opt_syscons.h
 SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h