Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108488
b: refs/heads/master
c: 34c86c1
h: refs/heads/master
v: v3
  • Loading branch information
Darrick J. Wong authored and Linus Torvalds committed Aug 15, 2008
1 parent e0d91ee commit 953143f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb15e7f286e3ecf3e85e06ad9b0019096e43a613
refs/heads/master: 34c86c1e622ec77ba81c01969003bbc8e15156f3
5 changes: 3 additions & 2 deletions trunk/drivers/hwmon/coretemp.c
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,11 @@ static int __init coretemp_init(void)
for_each_online_cpu(i) {
struct cpuinfo_x86 *c = &cpu_data(i);

/* check if family 6, models 0xe, 0xf, 0x16, 0x17 */
/* check if family 6, models 0xe, 0xf, 0x16, 0x17, 0x1A */
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 == 0x16) || (c->x86_model == 0x17) ||
(c->x86_model == 0x1A))) {

/* supported CPU not found, but report the unknown
family 6 CPU */
Expand Down

0 comments on commit 953143f

Please sign in to comment.