From dfacc168e38226af0bb1c4fb855cf53d714ac11d Mon Sep 17 00:00:00 2001
From: jruoho <jruoho@NetBSD.org>
Date: Sat, 24 Sep 2011 10:52:56 +0000
Subject: [PATCH] Use rdmsr_safe() when reading IA32_TEMPERATURE_TARGET.

---
 sys/arch/x86/x86/coretemp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/arch/x86/x86/coretemp.c b/sys/arch/x86/x86/coretemp.c
index 4686abc65b67..b3621a39bb89 100644
--- a/sys/arch/x86/x86/coretemp.c
+++ b/sys/arch/x86/x86/coretemp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.26 2011/06/20 15:01:30 pgoyette Exp $ */
+/* $NetBSD: coretemp.c,v 1.27 2011/09/24 10:52:56 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.26 2011/06/20 15:01:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.27 2011/09/24 10:52:56 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -289,7 +289,6 @@ coretemp_tjmax(device_t self)
 		}
 	}
 
-#if 0
 	/*
 	 * Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET,
 	 * but only consider the interval [70, 100] C as valid.
@@ -297,7 +296,9 @@ coretemp_tjmax(device_t self)
 	 */
 	if (model == 0x0E && extmodel != 0) {
 
-		msr = rdmsr(MSR_TEMPERATURE_TARGET);
+		if (rdmsr_safe(MSR_TEMPERATURE_TARGET, &msr) == EFAULT)
+			return;
+
 		msr = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
 
 		if (msr >= 70 && msr <= 100) {
@@ -305,7 +306,6 @@ coretemp_tjmax(device_t self)
 			return;
 		}
 	}
-#endif
 }
 
 static void