From 7059cdf2d343d8aa6039ffeec64892ba27903ccc Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Sun, 24 Dec 1995 08:11:46 +0000
Subject: [PATCH] Added I686_CPU.

---
 sys/amd64/conf/GENERIC | 3 ++-
 sys/conf/NOTES         | 3 ++-
 sys/i386/conf/GENERIC  | 3 ++-
 sys/i386/conf/LINT     | 3 ++-
 sys/i386/conf/NOTES    | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 1e35932f6fd5..bff46a52b97a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,13 +1,14 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.54 1995/12/12 08:46:34 gibbs Exp $
+#	$Id: GENERIC,v 1.55 1995/12/14 14:35:27 peter Exp $
 #
 
 machine		"i386"
 cpu		"I386_CPU"
 cpu		"I486_CPU"
 cpu		"I586_CPU"
+cpu		"I686_CPU"
 ident		GENERIC
 maxusers	10
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 000808e7de94..9c0e31041029 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.224 1995/12/16 21:00:14 bde Exp $
+#	$Id: LINT,v 1.225 1995/12/22 18:44:07 bde 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
@@ -20,6 +20,7 @@ machine		"i386"
 cpu		"I386_CPU"
 cpu		"I486_CPU"
 cpu		"I586_CPU"		# aka Pentium(tm)
+cpu		"I686_CPU"		# aka Pentium Pro(tm)
 
 # 
 # This is the ``identification'' of the kernel.  Usually this should
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 1e35932f6fd5..bff46a52b97a 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,13 +1,14 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.54 1995/12/12 08:46:34 gibbs Exp $
+#	$Id: GENERIC,v 1.55 1995/12/14 14:35:27 peter Exp $
 #
 
 machine		"i386"
 cpu		"I386_CPU"
 cpu		"I486_CPU"
 cpu		"I586_CPU"
+cpu		"I686_CPU"
 ident		GENERIC
 maxusers	10
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 000808e7de94..9c0e31041029 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.224 1995/12/16 21:00:14 bde Exp $
+#	$Id: LINT,v 1.225 1995/12/22 18:44:07 bde 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
@@ -20,6 +20,7 @@ machine		"i386"
 cpu		"I386_CPU"
 cpu		"I486_CPU"
 cpu		"I586_CPU"		# aka Pentium(tm)
+cpu		"I686_CPU"		# aka Pentium Pro(tm)
 
 # 
 # This is the ``identification'' of the kernel.  Usually this should
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 000808e7de94..9c0e31041029 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.224 1995/12/16 21:00:14 bde Exp $
+#	$Id: LINT,v 1.225 1995/12/22 18:44:07 bde 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
@@ -20,6 +20,7 @@ machine		"i386"
 cpu		"I386_CPU"
 cpu		"I486_CPU"
 cpu		"I586_CPU"		# aka Pentium(tm)
+cpu		"I686_CPU"		# aka Pentium Pro(tm)
 
 # 
 # This is the ``identification'' of the kernel.  Usually this should