summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/amd64/est.c10
-rw-r--r--sys/arch/i386/i386/machdep.c10
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/est.c b/sys/arch/amd64/amd64/est.c
index b7a166d64d4..7ac4af733b7 100644
--- a/sys/arch/amd64/amd64/est.c
+++ b/sys/arch/amd64/amd64/est.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: est.c,v 1.21 2010/07/05 22:47:41 jsg Exp $ */
+/* $OpenBSD: est.c,v 1.22 2010/12/29 18:10:17 kettenis Exp $ */
/*
* Copyright (c) 2003 Michael Eriksson.
* All rights reserved.
@@ -216,9 +216,11 @@ p3_get_bus_clock(struct cpu_info *ci)
break;
}
break;
- case 0x1a: /* Core i7 */
- case 0x1e: /* Core i5 */
- case 0x25: /* Core i3 */
+ case 0x1a: /* Core i7, Xeon 3500/5500 */
+ case 0x1e: /* Core i5/i7, Xeon 3400 */
+ case 0x25: /* Core i3/i5, Xeon 3400 */
+ case 0x2c: /* Core i7, Xeon 3600/5600 */
+ case 0x2e: /* Xeon 6500/7500 */
break;
default:
printf("%s: unknown i686 model 0x%x, can't get bus clock\n",
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index fd7453aa2ae..c9009d61036 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.485 2010/10/02 23:31:34 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.486 2010/12/29 18:10:17 kettenis Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2101,9 +2101,11 @@ p3_get_bus_clock(struct cpu_info *ci)
goto print_msr;
}
break;
- case 0x1a: /* Core i7 */
- case 0x1e: /* Core i5 */
- case 0x25: /* Core i3 */
+ case 0x1a: /* Core i7, Xeon 3500/5500 */
+ case 0x1e: /* Core i5/i7, Xeon 3400 */
+ case 0x25: /* Core i3/i5, Xeon 3400 */
+ case 0x2c: /* Core i7, Xeon 3600/5600 */
+ case 0x2e: /* Xeon 6500/7500 */
break;
default:
printf("%s: unknown i686 model 0x%x, can't get bus clock",