From eb03ccd8ac2be8267c9e646b484ca1a895307f11 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Wed, 14 Sep 2011 04:43:07 -0400
Subject: [PATCH] --- yaml --- r: 263839 b: refs/heads/master c:
 cd5bd3df1a6e7a68454734fb109c409101c20f42 h: refs/heads/master i:   263837:
 98083f36e7db9bec61cd511a8ca05635cff72ef0   263835:
 f26b6d517be00ed692b104f52f2eb6196332bb5b   263831:
 cb9693ea67c562e3acc18b24b4d1a044e4ab0aca   263823:
 248242a580893fc24798efb93a0ff3e553e13dcf   263807:
 8031f3f2e76bac299aaeb2bf3ebb1df10bfad09e v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/hwmon/coretemp.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1c0342af3565..5d5c9f7ac267 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40257b953fdd519c743138f3fbe3962d54991116
+refs/heads/master: cd5bd3df1a6e7a68454734fb109c409101c20f42
diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c
index 59d83e83da7f..411257676133 100644
--- a/trunk/drivers/hwmon/coretemp.c
+++ b/trunk/drivers/hwmon/coretemp.c
@@ -601,7 +601,12 @@ static int create_core_data(struct platform_data *pdata,
 	err = rdmsr_safe_on_cpu(cpu, tdata->intrpt_reg, &eax, &edx);
 	if (!err) {
 		tdata->attr_size += MAX_THRESH_ATTRS;
-		tdata->ttarget = tdata->tjmax - ((eax >> 16) & 0x7f) * 1000;
+		tdata->tmin = tdata->tjmax -
+			      ((eax & THERM_MASK_THRESHOLD0) >>
+			       THERM_SHIFT_THRESHOLD0) * 1000;
+		tdata->ttarget = tdata->tjmax -
+				 ((eax & THERM_MASK_THRESHOLD1) >>
+				  THERM_SHIFT_THRESHOLD1) * 1000;
 	}
 
 	pdata->core_data[attr_no] = tdata;