- Implement enabling write allocate on AMD K5/K6/K6-2 cpus.

  The code was originaly contributed by Kelly Yancey
  <kbyanc@freedomnet.com> in PR i386/6269 and revised by Akio Morita
  <amorita@meadow.scphys.kyoto-u.ac.jp> and me.  Test was performed by
  Akio Morita and Toshiomi Moriki <moriki@db.is.kyushu-u.ac.jp>.
- Fix stylistic bug in identcpu.c.
- Update copyright in initcpu.c
- Fix typo in LINT.

PR:		6269 and 6270

3 files changed, 12 insertions, 7 deletions

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index dc8ccff..b74cb36 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.481 1998/10/02 21:00:58 ken Exp $
+#	$Id: LINT,v 1.482 1998/10/05 07:45:54 obrien 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
@@ -163,7 +163,8 @@ cpu		"I686_CPU"		# aka Pentium Pro(tm)
 # CPU_SUSP_HLT enables suspend on HALT.  If this option is set, CPU
 # enters suspend mode following execution of HALT instruction.
 #
-# CPU_WT_ALLOC enables write-through allocation.
+# CPU_WT_ALLOC enables write allocation on Cyrix 6x86/6x86MX and AMD
+# K5/K6/K6-2 cpus.
 #
 # CYRIX_CACHE_WORKS enables CPU cache on Cyrix 486 CPUs with cache
 # flush at hold state.
@@ -178,7 +179,7 @@ cpu		"I686_CPU"		# aka Pentium Pro(tm)
 # on a Pentium.
 #
 # NOTE 1: The options, CPU_BTB_EN, CPU_LOOP_EN, CPU_IORT,
-# CPU_LOOP_ENand CPU_RSTK_EN should no be used becasue of CPU bugs.
+# CPU_LOOP_ENand CPU_RSTK_EN should not be used becasue of CPU bugs.
 # These options may crash your system. 
 #
 # NOTE 2: If CYRIX_CACHE_REALLY_WORKS is not set, CPU cache is enabled
@@ -199,6 +200,7 @@ options		"CPU_IORT"
 options		"CPU_LOOP_EN"
 options		"CPU_RSTK_EN"
 options		"CPU_SUSP_HLT"
+options		"CPU_WT_ALLOC"
 options		"CYRIX_CACHE_WORKS"
 options		"CYRIX_CACHE_REALLY_WORKS"
 #options	"NO_F00F_HACK"
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index dc8ccff..b74cb36 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.481 1998/10/02 21:00:58 ken Exp $
+#	$Id: LINT,v 1.482 1998/10/05 07:45:54 obrien 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
@@ -163,7 +163,8 @@ cpu		"I686_CPU"		# aka Pentium Pro(tm)
 # CPU_SUSP_HLT enables suspend on HALT.  If this option is set, CPU
 # enters suspend mode following execution of HALT instruction.
 #
-# CPU_WT_ALLOC enables write-through allocation.
+# CPU_WT_ALLOC enables write allocation on Cyrix 6x86/6x86MX and AMD
+# K5/K6/K6-2 cpus.
 #
 # CYRIX_CACHE_WORKS enables CPU cache on Cyrix 486 CPUs with cache
 # flush at hold state.
@@ -178,7 +179,7 @@ cpu		"I686_CPU"		# aka Pentium Pro(tm)
 # on a Pentium.
 #
 # NOTE 1: The options, CPU_BTB_EN, CPU_LOOP_EN, CPU_IORT,
-# CPU_LOOP_ENand CPU_RSTK_EN should no be used becasue of CPU bugs.
+# CPU_LOOP_ENand CPU_RSTK_EN should not be used becasue of CPU bugs.
 # These options may crash your system. 
 #
 # NOTE 2: If CYRIX_CACHE_REALLY_WORKS is not set, CPU cache is enabled
@@ -199,6 +200,7 @@ options		"CPU_IORT"
 options		"CPU_LOOP_EN"
 options		"CPU_RSTK_EN"
 options		"CPU_SUSP_HLT"
+options		"CPU_WT_ALLOC"
 options		"CYRIX_CACHE_WORKS"
 options		"CYRIX_CACHE_REALLY_WORKS"
 #options	"NO_F00F_HACK"
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index d0553ee..9cb9eb8 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.88 1998/09/24 13:20:40 yokota Exp $
+#	$Id: options.i386,v 1.89 1998/09/25 17:34:48 peter Exp $
 
 DISABLE_PSE
 USER_LDT
@@ -58,6 +58,7 @@ CPU_LOOP_EN			opt_cpu.h
 CPU_RSTK_EN			opt_cpu.h
 CPU_SUSP_HLT			opt_cpu.h
 CPU_UPGRADE_HW_CACHE		opt_cpu.h
+CPU_WT_ALLOC			opt_cpu.h
 CYRIX_CACHE_WORKS		opt_cpu.h
 CYRIX_CACHE_REALLY_WORKS	opt_cpu.h