From d037f7d6c3ba6cdb5ffcf161105e11d31867959d Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Fri, 29 Sep 2000 04:38:35 +0000
Subject: [PATCH] First shot at identifying the Pentum 4 acording to our
 reading of the the cpu_id extensions in the Intel docs.  There is more info
 available. See the following URL for more details.
 http://developer.intel.com/design/processor/future/manuals/CPUID_Supplement.htm

Requested by:	Intel
---
 sys/amd64/amd64/identcpu.c   | 5 +++++
 sys/amd64/include/cputypes.h | 5 +++--
 sys/i386/i386/identcpu.c     | 5 +++++
 sys/i386/include/cputypes.h  | 5 +++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 2b6d4846b2c2..49014acda595 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -106,6 +106,7 @@ static struct cpu_nameclass i386_cpus[] = {
 	{ "Cyrix 486S/DX",	CPUCLASS_486 },		/* CPU_CY486DX */
 	{ "Pentium II",		CPUCLASS_686 },		/* CPU_PII */
 	{ "Pentium III",	CPUCLASS_686 },		/* CPU_PIII */
+	{ "Pentium 4",		CPUCLASS_686 },		/* CPU_P4 */
 };
 
 static void
@@ -220,6 +221,10 @@ printcpuinfo(void)
 					break;
 				}
 				break;
+			case 0xf00:
+				strcat(cpu_model, "Pentium 4");
+				cpu = CPU_P4;
+				break;
 			default:
 				strcat(cpu_model, "unknown");
 				break;
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index 93e01e26287d..585df6753a21 100644
--- a/sys/amd64/include/cputypes.h
+++ b/sys/amd64/include/cputypes.h
@@ -56,8 +56,9 @@
 #define	CPU_M2		11	/* Cyrix M2 (aka enhanced 6x86 with MMX */
 #define	CPU_NX586	12	/* NexGen (now AMD) 586 */
 #define	CPU_CY486DX	13	/* Cyrix 486S/DX/DX2/DX4 */
-#define CPU_PII		14	/* Intel Pentium II */
-#define CPU_PIII	15	/* Intel Pentium III */
+#define	CPU_PII		14	/* Intel Pentium II */
+#define	CPU_PIII	15	/* Intel Pentium III */
+#define	CPU_P4		16	/* Intel Pentium 4 */
 
 #ifndef LOCORE
 struct cpu_nameclass {
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 2b6d4846b2c2..49014acda595 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -106,6 +106,7 @@ static struct cpu_nameclass i386_cpus[] = {
 	{ "Cyrix 486S/DX",	CPUCLASS_486 },		/* CPU_CY486DX */
 	{ "Pentium II",		CPUCLASS_686 },		/* CPU_PII */
 	{ "Pentium III",	CPUCLASS_686 },		/* CPU_PIII */
+	{ "Pentium 4",		CPUCLASS_686 },		/* CPU_P4 */
 };
 
 static void
@@ -220,6 +221,10 @@ printcpuinfo(void)
 					break;
 				}
 				break;
+			case 0xf00:
+				strcat(cpu_model, "Pentium 4");
+				cpu = CPU_P4;
+				break;
 			default:
 				strcat(cpu_model, "unknown");
 				break;
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index 93e01e26287d..585df6753a21 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -56,8 +56,9 @@
 #define	CPU_M2		11	/* Cyrix M2 (aka enhanced 6x86 with MMX */
 #define	CPU_NX586	12	/* NexGen (now AMD) 586 */
 #define	CPU_CY486DX	13	/* Cyrix 486S/DX/DX2/DX4 */
-#define CPU_PII		14	/* Intel Pentium II */
-#define CPU_PIII	15	/* Intel Pentium III */
+#define	CPU_PII		14	/* Intel Pentium II */
+#define	CPU_PIII	15	/* Intel Pentium III */
+#define	CPU_P4		16	/* Intel Pentium 4 */
 
 #ifndef LOCORE
 struct cpu_nameclass {