ename "i586_ctr" to "tsc" (both upper and lower case instances).

Fix a couple of printfs too.

Warning: This changes the names of a couple of kernel options!

5 files changed, 13 insertions, 13 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7051961..9be4926 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.385 1997/12/12 14:08:43 peter Exp $
+#	$Id: LINT,v 1.386 1997/12/23 08:01:16 yokota 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
@@ -1361,14 +1361,14 @@ options		GATEWAY
 
 options		CLK_CALIBRATION_LOOP
 options		"CLK_USE_I8254_CALIBRATION"
-options		"CLK_USE_I586_CALIBRATION"
+options		"CLK_USE_TSC_CALIBRATION"
 options		CLUSTERDEBUG
 options		COMPAT_LINUX
 options		CPU_UPGRADE_HW_CACHE
 options		DEBUG
 options		DEVFS_ROOT
 options		"EXT2FS"
-options		"I586_CTR_GUPROF"
+options		"TSC_GUPROF"
 options		"I586_PMC_GUPROF=0x70000"
 options		"IBCS2"
 options		LOCKF_DEBUG
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 16ba184..3569db5 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.63 1997/12/04 21:20:58 jmg Exp $
+#	$Id: options.i386,v 1.64 1997/12/09 11:56:19 yokota Exp $
 
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
@@ -24,7 +24,7 @@ COM_ESP			opt_sio.h
 COM_MULTIPORT		opt_sio.h
 DSI_SOFT_MODEM		opt_sio.h
 EXTRA_SIO		opt_sio.h
-I586_CTR_GUPROF		opt_i586_guprof.h
+TSC_GUPROF		opt_i586_guprof.h
 I586_PMC_GUPROF		opt_i586_guprof.h
 WLCACHE			opt_wavelan.h
 WLDEBUG			opt_wavelan.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7051961..9be4926 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.385 1997/12/12 14:08:43 peter Exp $
+#	$Id: LINT,v 1.386 1997/12/23 08:01:16 yokota 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
@@ -1361,14 +1361,14 @@ options		GATEWAY
 
 options		CLK_CALIBRATION_LOOP
 options		"CLK_USE_I8254_CALIBRATION"
-options		"CLK_USE_I586_CALIBRATION"
+options		"CLK_USE_TSC_CALIBRATION"
 options		CLUSTERDEBUG
 options		COMPAT_LINUX
 options		CPU_UPGRADE_HW_CACHE
 options		DEBUG
 options		DEVFS_ROOT
 options		"EXT2FS"
-options		"I586_CTR_GUPROF"
+options		"TSC_GUPROF"
 options		"I586_PMC_GUPROF=0x70000"
 options		"IBCS2"
 options		LOCKF_DEBUG
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7051961..9be4926 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.385 1997/12/12 14:08:43 peter Exp $
+#	$Id: LINT,v 1.386 1997/12/23 08:01:16 yokota 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
@@ -1361,14 +1361,14 @@ options		GATEWAY
 
 options		CLK_CALIBRATION_LOOP
 options		"CLK_USE_I8254_CALIBRATION"
-options		"CLK_USE_I586_CALIBRATION"
+options		"CLK_USE_TSC_CALIBRATION"
 options		CLUSTERDEBUG
 options		COMPAT_LINUX
 options		CPU_UPGRADE_HW_CACHE
 options		DEBUG
 options		DEVFS_ROOT
 options		"EXT2FS"
-options		"I586_CTR_GUPROF"
+options		"TSC_GUPROF"
 options		"I586_PMC_GUPROF=0x70000"
 options		"IBCS2"
 options		LOCKF_DEBUG
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 16ba184..3569db5 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.63 1997/12/04 21:20:58 jmg Exp $
+#	$Id: options.i386,v 1.64 1997/12/09 11:56:19 yokota Exp $
 
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
@@ -24,7 +24,7 @@ COM_ESP			opt_sio.h
 COM_MULTIPORT		opt_sio.h
 DSI_SOFT_MODEM		opt_sio.h
 EXTRA_SIO		opt_sio.h
-I586_CTR_GUPROF		opt_i586_guprof.h
+TSC_GUPROF		opt_i586_guprof.h
 I586_PMC_GUPROF		opt_i586_guprof.h
 WLCACHE			opt_wavelan.h
 WLDEBUG			opt_wavelan.h