Fix Tjmax detection in coretemp driver
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTYivDAAoJEMsfJm/On5mBR5MP/ArwurVetLdvmkSkFYBkceha 6iuN59BzbsntQlwUBdxYmlPVs+k96iAZjkc6pcWxuL2B5VVXw9alMCd63CYBbJ5D Qh0HQJuhm/gDcEpcbSxgQZLR+RL/tuAOEI2w8MZoRTvykSCcHU1BbfxR37gh7y/T e+TyUQ7YC3URDzL6dwHjZcxil+usef43KzN7+WoiTEqzHOI34n3LrGjc0mnfqC8/ +1WxyZDjDSLlFx1vD84DQkWvGmpxuFdlo5R4HPs583tHDQEcXe7//9vSv1w7uxb0 dSjq8pI+X7R1GfUP/aSyJYb0jjTTWS9KeGk16VNjmZzTnERSlim5IL/l8FHaNXxO gdSJdiubBI0uqIO/BF/9vD4YMKz5Ljbqmm5csznBcgV6jIimAE5wTPUY5rNarGXC s5+aQ/P4/xGpEh7awjtoDHSHqxjtuk0CEphQyIp2pWiDRP5rkWevXARypTuaSIs/ QbRWXNnLc6STf4QLxvfUbmWN9Ohyf5XlWaAn3FRg1cL0MRiMimVFYerqwfGC7pHo Jcstdw/w8xIK0skxth3bsjh4ZJyrjAItG5KgbIGnHj5vytUp9BXUQW9dAonLdhPJ 7qrzvj5hzjFK2HdTQS6wLX8CEDWJervlCkXvtDPts3loG9XUsKGWZx+g1UW+Doeu 5nBQqxaQ3+lcig6S+8U1 =W/j8 -----END PGP SIGNATURE----- Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon fix from Guenter Roeck: "Fix Tjmax detection in coretemp driver" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: Revert "hwmon: (coretemp) Refine TjMax detection"
This commit is contained in:
Коммит
f496136686
|
@ -365,12 +365,12 @@ static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
|
|||
if (cpu_has_tjmax(c))
|
||||
dev_warn(dev, "Unable to read TjMax from CPU %u\n", id);
|
||||
} else {
|
||||
val = (eax >> 16) & 0x7f;
|
||||
val = (eax >> 16) & 0xff;
|
||||
/*
|
||||
* If the TjMax is not plausible, an assumption
|
||||
* will be used
|
||||
*/
|
||||
if (val >= 85) {
|
||||
if (val) {
|
||||
dev_dbg(dev, "TjMax is %d degrees C\n", val);
|
||||
return val * 1000;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче