Module Name: src
Committed By: ahoka
Date: Sat Mar 19 06:15:12 UTC 2011
Modified Files:
src/sys/arch/x86/x86: coretemp.c
Log Message:
Dont try to read MSR_TEMPERATURE_TARGET on Core Duo Yonah
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/x86/coretemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.24 src/sys/arch/x86/x86/coretemp.c:1.25
--- src/sys/arch/x86/x86/coretemp.c:1.24 Fri Mar 18 20:56:46 2011
+++ src/sys/arch/x86/x86/coretemp.c Sat Mar 19 06:15:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.24 2011/03/18 20:56:46 jruoho Exp $ */
+/* $NetBSD: coretemp.c,v 1.25 2011/03/19 06:15:12 ahoka Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.24 2011/03/18 20:56:46 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.25 2011/03/19 06:15:12 ahoka Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -294,7 +294,7 @@
* but only consider the interval [70, 100] C as valid.
* It is not fully known which CPU models have the MSR.
*/
- if (model == 0x0E) {
+ if (model == 0x0E && extmodel != 0) {
msr = rdmsr(MSR_TEMPERATURE_TARGET);
msr = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
