diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-12-01 18:59:14 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-12-01 18:59:14 +0000 |
| commit | 51c1503cb8bdc9db4eaf251be648f8084dfbd580 (patch) | |
| tree | 0ab3f06155de50ed3ce0b6a15b803807dc7ee018 | |
| parent | baf81185692d7126104116315f87b9b485d36a99 (diff) | |
Don't claim to know about nehalem until we can be sure
the the msr paths are sane.
ok deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/est.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/est.c b/sys/arch/amd64/amd64/est.c index c405bc2874f..0bf7f364a4c 100644 --- a/sys/arch/amd64/amd64/est.c +++ b/sys/arch/amd64/amd64/est.c @@ -1,4 +1,4 @@ -/* $OpenBSD: est.c,v 1.16 2009/12/01 18:31:36 jsg Exp $ */ +/* $OpenBSD: est.c,v 1.17 2009/12/01 18:59:13 jsg Exp $ */ /* * Copyright (c) 2003 Michael Eriksson. * All rights reserved. @@ -196,9 +196,6 @@ p3_get_bus_clock(struct cpu_info *ci) break; } break; - case 0x1a: /* Nehalem based Core i7 and Xeon */ - bus_clock = BUS133; - break; case 0x1c: /* Atom */ msr = rdmsr(MSR_FSB_FREQ); bus = (msr >> 0) & 0x7; diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index b105d4a8cb2..6298e1c731f 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.466 2009/11/26 08:45:12 nicm Exp $ */ +/* $OpenBSD: machdep.c,v 1.467 2009/12/01 18:59:13 jsg Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2004,9 +2004,6 @@ p3_get_bus_clock(struct cpu_info *ci) goto print_msr; } break; - case 0x1a: /* Nehalem based Core i7 and Xeon */ - bus_clock = BUS133; - break; case 0x1c: /* Atom */ msr = rdmsr(MSR_FSB_FREQ); bus = (msr >> 0) & 0x7; |