|
@@ -304,24 +304,9 @@ static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
|
|
|
|
|
|
/*
|
|
|
* An assumption is made for early CPUs and unreadable MSR.
|
|
|
- * NOTE: the given value may not be correct.
|
|
|
+ * NOTE: the calculated value may not be correct.
|
|
|
*/
|
|
|
-
|
|
|
- switch (c->x86_model) {
|
|
|
- case 0xe:
|
|
|
- case 0xf:
|
|
|
- case 0x16:
|
|
|
- case 0x1a:
|
|
|
- dev_warn(dev, "TjMax is assumed as 100 C!\n");
|
|
|
- return 100000;
|
|
|
- case 0x17:
|
|
|
- case 0x1c: /* Atom CPUs */
|
|
|
- return adjust_tjmax(c, id, dev);
|
|
|
- default:
|
|
|
- dev_warn(dev, "CPU (model=0x%x) is not supported yet,"
|
|
|
- " using default TjMax of 100C.\n", c->x86_model);
|
|
|
- return 100000;
|
|
|
- }
|
|
|
+ return adjust_tjmax(c, id, dev);
|
|
|
}
|
|
|
|
|
|
static void __devinit get_ucode_rev_on_cpu(void *edx)
|