diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-06-04 15:03:35 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-06-04 15:03:35 +0000 |
| commit | 5574b0581c72838fc2a238b4782532a13acdaf13 (patch) | |
| tree | 2f0066a522563b5e85d66921b8b0083b689dd49f /sys/arch | |
| parent | 828b2554855070eda4b569de414fb845f63b3def (diff) | |
Don't warn about not knowing what the bus clock is on core i7/i5/i3
as the high/low guessing won't be done on these processors due to MSR
differences.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/est.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/est.c b/sys/arch/amd64/amd64/est.c index 4e1283738e6..55bc3f891a5 100644 --- a/sys/arch/amd64/amd64/est.c +++ b/sys/arch/amd64/amd64/est.c @@ -1,4 +1,4 @@ -/* $OpenBSD: est.c,v 1.19 2010/04/20 22:05:41 tedu Exp $ */ +/* $OpenBSD: est.c,v 1.20 2010/06/04 15:03:34 jsg Exp $ */ /* * Copyright (c) 2003 Michael Eriksson. * All rights reserved. @@ -216,6 +216,10 @@ p3_get_bus_clock(struct cpu_info *ci) break; } break; + case 0x1a: /* Core i7 */ + case 0x1e: /* Core i5 */ + case 0x25: /* Core i3 */ + break; default: printf("%s: unknown i686 model 0x%x, can't get bus clock\n", ci->ci_dev->dv_xname, ci->ci_model); diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 71c92a55c46..86f38a861cb 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.471 2010/05/08 16:54:07 oga Exp $ */ +/* $OpenBSD: machdep.c,v 1.472 2010/06/04 15:03:34 jsg Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2086,6 +2086,10 @@ p3_get_bus_clock(struct cpu_info *ci) goto print_msr; } break; + case 0x1a: /* Core i7 */ + case 0x1e: /* Core i5 */ + case 0x25: /* Core i3 */ + break; default: printf("%s: unknown i686 model 0x%x, can't get bus clock", ci->ci_dev.dv_xname, ci->ci_model); |