diff options
-rw-r--r-- | drivers/thermal/intel_powerclamp.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c index 0e4dc0afcfd2..7a223074df3d 100644 --- a/drivers/thermal/intel_powerclamp.c +++ b/drivers/thermal/intel_powerclamp.c | |||
@@ -669,20 +669,10 @@ static struct thermal_cooling_device_ops powerclamp_cooling_ops = { | |||
669 | .set_cur_state = powerclamp_set_cur_state, | 669 | .set_cur_state = powerclamp_set_cur_state, |
670 | }; | 670 | }; |
671 | 671 | ||
672 | static const struct x86_cpu_id intel_powerclamp_ids[] __initconst = { | ||
673 | { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_MWAIT }, | ||
674 | { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_ARAT }, | ||
675 | { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_NONSTOP_TSC }, | ||
676 | { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_CONSTANT_TSC}, | ||
677 | {} | ||
678 | }; | ||
679 | MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids); | ||
680 | |||
681 | static int __init powerclamp_probe(void) | 672 | static int __init powerclamp_probe(void) |
682 | { | 673 | { |
683 | if (!x86_match_cpu(intel_powerclamp_ids)) { | 674 | if (!boot_cpu_has(X86_FEATURE_MWAIT)) { |
684 | pr_err("Intel powerclamp does not run on family %d model %d\n", | 675 | pr_err("CPU does not support MWAIT"); |
685 | boot_cpu_data.x86, boot_cpu_data.x86_model); | ||
686 | return -ENODEV; | 676 | return -ENODEV; |
687 | } | 677 | } |
688 | 678 | ||