From e9b48d7e7c498945dd65a84ecac22862ebf60c67 Mon Sep 17 00:00:00 2001 From: Michael Riepe Date: Mon, 21 Sep 2009 17:04:41 -0700 Subject: [PATCH] --- yaml --- r: 164536 b: refs/heads/master c: 0bf41d9f414a5cf558aff234a0ff486257537574 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/coretemp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 998cc204fa4a..d6e024a97a23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42e41c54d61e32e8a349943607daa53205324d7f +refs/heads/master: 0bf41d9f414a5cf558aff234a0ff486257537574 diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c index 93c17223b527..972cf4ba963c 100644 --- a/trunk/drivers/hwmon/coretemp.c +++ b/trunk/drivers/hwmon/coretemp.c @@ -185,7 +185,7 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device * } } - if (ismobile) { + if (ismobile || c->x86_model == 0x1c) { err = rdmsr_safe_on_cpu(id, 0xee, &eax, &edx); if (err) { @@ -417,7 +417,7 @@ static int __init coretemp_init(void) if ((c->cpuid_level < 0) || (c->x86 != 0x6) || !((c->x86_model == 0xe) || (c->x86_model == 0xf) || (c->x86_model == 0x16) || (c->x86_model == 0x17) || - (c->x86_model == 0x1A))) { + (c->x86_model == 0x1A) || (c->x86_model == 0x1c))) { /* supported CPU not found, but report the unknown family 6 CPU */