Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/x86 Dont try to read MSR_TEMPERATURE_TARGET on ...



details:   https://anonhg.NetBSD.org/src/rev/399215effc2d
branches:  trunk
changeset: 763426:399215effc2d
user:      ahoka <ahoka%NetBSD.org@localhost>
date:      Sat Mar 19 06:15:12 2011 +0000

description:
Dont try to read MSR_TEMPERATURE_TARGET on Core Duo Yonah

diffstat:

 sys/arch/x86/x86/coretemp.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r e58e69c3c8a8 -r 399215effc2d sys/arch/x86/x86/coretemp.c
--- a/sys/arch/x86/x86/coretemp.c       Sat Mar 19 05:18:36 2011 +0000
+++ b/sys/arch/x86/x86/coretemp.c       Sat Mar 19 06:15:12 2011 +0000
@@ -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);



Home | Main Index | Thread Index | Old Index