aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKATO Takenori <kato@FreeBSD.org>1999-02-06 16:20:18 +0000
committerKATO Takenori <kato@FreeBSD.org>1999-02-06 16:20:18 +0000
commit3e9f0645e143177468d5811cb33001ca8e69ed27 (patch)
tree025523ac43b0bff75c7c53656f69451b023a5ef9 /sys
parent1205ceba72fbd3a7f15379adffd301ad6b663f84 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/i386/i386/identcpu.c13
-rw-r--r--sys/i386/include/cputypes.h3
2 files changed, 13 insertions, 3 deletions
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 146db244a836..1ae1a862b208 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- * $Id: identcpu.c,v 1.56 1999/01/09 13:07:18 bde Exp $
+ * $Id: identcpu.c,v 1.57 1999/01/16 13:41:33 kato Exp $
*/
#include "opt_cpu.h"
@@ -99,6 +99,7 @@ static struct cpu_nameclass i386_cpus[] = {
{ "NexGen 586", CPUCLASS_386 }, /* CPU_NX586 (XXX) */
{ "Cyrix 486S/DX", CPUCLASS_486 }, /* CPU_CY486DX */
{ "Pentium II", CPUCLASS_686 }, /* CPU_PII */
+ { "Pentium III", CPUCLASS_686 }, /* CPU_PIII */
};
static void
@@ -199,9 +200,17 @@ printcpuinfo(void)
cpu = CPU_PII;
break;
case 0x50:
- strcat(cpu_model, "Pentium II (quarter-micron)");
+ strcat(cpu_model, "Pentium II/Xeon/Celeron");
cpu = CPU_PII;
break;
+ case 0x60:
+ strcat(cpu_model, "Celeron");
+ cpu = CPU_PII;
+ break;
+ case 0x70:
+ strcat(cpu_model, "Pentium III");
+ cpu = CPU_PIII;
+ break;
default:
strcat(cpu_model, "Unknown 80686");
break;
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index c7bc3fe1913e..ece2509927ab 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cputypes.h,v 1.10 1997/10/28 11:43:50 bde Exp $
+ * $Id: cputypes.h,v 1.11 1998/05/22 00:03:23 des Exp $
*/
#ifndef _MACHINE_CPUTYPES_H_
@@ -57,6 +57,7 @@
#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 */
#ifndef LOCORE
struct cpu_nameclass {