Skip to content

Commit ec638db

Browse files
Jacob Panzhang-rui
authored andcommitted
thermal/powerclamp: add back module device table
Commit 3105f23 replaced module cpu id table with a cpu feature check, which is logically correct. But we need the module device table to allow module auto loading. Cc: stable@vger.kernel.org # 4.8 Fixes:3105f234 thermal/powerclamp: correct cpu support check Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
1 parent b58ec8b commit ec638db

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

drivers/thermal/intel_powerclamp.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,9 +669,16 @@ static struct thermal_cooling_device_ops powerclamp_cooling_ops = {
669669
.set_cur_state = powerclamp_set_cur_state,
670670
};
671671

672+
static const struct x86_cpu_id __initconst intel_powerclamp_ids[] = {
673+
{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_MWAIT },
674+
{}
675+
};
676+
MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids);
677+
672678
static int __init powerclamp_probe(void)
673679
{
674-
if (!boot_cpu_has(X86_FEATURE_MWAIT)) {
680+
681+
if (!x86_match_cpu(intel_powerclamp_ids)) {
675682
pr_err("CPU does not support MWAIT");
676683
return -ENODEV;
677684
}

0 commit comments

Comments
 (0)