From e1d345b504e3954e44d0f8fde2da02b0a8328bcb Mon Sep 17 00:00:00 2001 From: Rudolf Marek Date: Fri, 18 Jan 2008 00:50:04 +0100 Subject: [PATCH] --- yaml --- r: 86142 b: refs/heads/master c: ae770152c801f10a91e5e86597a39b5f9ccf2d0d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/hwmon/coretemp | 3 ++- trunk/drivers/hwmon/coretemp.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c6085e208459..7553706ff8e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 118a88718886a6cb7fb2cf7fb77ef2eea30c73a1 +refs/heads/master: ae770152c801f10a91e5e86597a39b5f9ccf2d0d diff --git a/trunk/Documentation/hwmon/coretemp b/trunk/Documentation/hwmon/coretemp index 7fb74419590f..dbbe6c7025b0 100644 --- a/trunk/Documentation/hwmon/coretemp +++ b/trunk/Documentation/hwmon/coretemp @@ -4,9 +4,10 @@ Kernel driver coretemp Supported chips: * All Intel Core family Prefix: 'coretemp' - CPUID: family 0x6, models 0xe, 0xf, 0x16 + CPUID: family 0x6, models 0xe, 0xf, 0x16, 0x17 Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual Volume 3A: System Programming Guide + http://softwarecommunity.intel.com/Wiki/Mobility/720.htm Author: Rudolf Marek diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c index 1f34ad84c557..70239acecc8e 100644 --- a/trunk/drivers/hwmon/coretemp.c +++ b/trunk/drivers/hwmon/coretemp.c @@ -413,10 +413,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, 16 */ + /* check if family 6, models 0xe, 0xf, 0x16, 0x17 */ if ((c->cpuid_level < 0) || (c->x86 != 0x6) || !((c->x86_model == 0xe) || (c->x86_model == 0xf) || - (c->x86_model == 0x16))) { + (c->x86_model == 0x16) || (c->x86_model == 0x17))) { /* supported CPU not found, but report the unknown family 6 CPU */