From 08badf26302414d0eda2b3c20f67db6a8414804a Mon Sep 17 00:00:00 2001 From: Rudolf Marek Date: Sun, 7 Oct 2007 13:42:09 +0200 Subject: [PATCH] --- yaml --- r: 68743 b: refs/heads/master c: c940336b4403540c498fceb102c7142799252129 h: refs/heads/master i: 68741: a17c12f362369744c421c7b91762a92accc41d83 68739: f9b535343b41bcb0b310d2c397a53bc6de72eb1b 68735: 1eae619c6107f10ac1bc6704badadd7a620fab93 v: v3 --- [refs] | 2 +- trunk/Documentation/hwmon/coretemp | 2 +- trunk/drivers/hwmon/coretemp.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f4f6c973ac8e..b15e3c817c84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 889af3d5d9586db795a06c619e416b4baee11da8 +refs/heads/master: c940336b4403540c498fceb102c7142799252129 diff --git a/trunk/Documentation/hwmon/coretemp b/trunk/Documentation/hwmon/coretemp index 870cda9416e9..170bf862437b 100644 --- a/trunk/Documentation/hwmon/coretemp +++ b/trunk/Documentation/hwmon/coretemp @@ -4,7 +4,7 @@ Kernel driver coretemp Supported chips: * All Intel Core family Prefix: 'coretemp' - CPUID: family 0x6, models 0xe, 0xf + CPUID: family 0x6, models 0xe, 0xf, 0x16 Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual Volume 3A: System Programming Guide diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c index 1a0ff8d42bb2..6f66551d9e51 100644 --- a/trunk/drivers/hwmon/coretemp.c +++ b/trunk/drivers/hwmon/coretemp.c @@ -369,9 +369,10 @@ static int __init coretemp_init(void) for_each_online_cpu(i) { struct cpuinfo_x86 *c = &(cpu_data)[i]; - /* check if family 6, models e, f */ + /* check if family 6, models e, f, 16 */ if ((c->cpuid_level < 0) || (c->x86 != 0x6) || - !((c->x86_model == 0xe) || (c->x86_model == 0xf))) { + !((c->x86_model == 0xe) || (c->x86_model == 0xf) || + (c->x86_model == 0x16))) { /* supported CPU not found, but report the unknown family 6 CPU */