2 files changed, 25 insertions, 8 deletions

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index a6c6ec36615e..249ac460e3d9 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -39,6 +39,7 @@
 #include <linux/moduleparam.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
+#include <asm/cpu_device_id.h>
 
 #define DRVNAME "coretemp"
 
@@ -759,13 +760,23 @@ static struct notifier_block coretemp_cpu_notifier __refdata = {
         .notifier_call = coretemp_cpu_callback,
 };
 
+static const struct x86_cpu_id coretemp_ids[] = {
+        { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTS },
+        {}
+};
+MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);
+
 static int __init coretemp_init(void)
 {
         int i, err = -ENODEV;
 
-        /* quick check if we run Intel */
-        if (cpu_data(0).x86_vendor != X86_VENDOR_INTEL)
-                goto exit;
+        /*
+         * CPUID.06H.EAX[0] indicates whether the CPU has thermal
+         * sensors. We check this bit only, all the early CPUs
+         * without thermal sensors will be filtered out.
+         */
+        if (!x86_match_cpu(coretemp_ids))
+                return -ENODEV;
 
         err = platform_driver_register(&coretemp_driver);
         if (err)
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 8eac67d769fa..8689664ef03c 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -37,6 +37,7 @@
 #include <linux/cpu.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
+#include <asm/cpu_device_id.h>
 
 #define DRVNAME "via_cputemp"
 
@@ -308,15 +309,20 @@ static struct notifier_block via_cputemp_cpu_notifier __refdata = {
         .notifier_call = via_cputemp_cpu_callback,
 };
 
+static const struct x86_cpu_id cputemp_ids[] = {
+        { X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */
+        { X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */
+        { X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */
+        {}
+};
+MODULE_DEVICE_TABLE(x86cpu, cputemp_ids);
+
 static int __init via_cputemp_init(void)
 {
         int i, err;
 
-        if (cpu_data(0).x86_vendor != X86_VENDOR_CENTAUR) {
-                printk(KERN_DEBUG DRVNAME ": Not a VIA CPU\n");
-                err = -ENODEV;
-                goto exit;
-        }
+        if (!x86_match_cpu(cputemp_ids))
+                return -ENODEV;
 
         err = platform_driver_register(&via_cputemp_driver);
         if (err)