leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thermal/powerclamp: add back module device table

Browse Source 
Commit 3105f234e0 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>
This commit is contained in:
Jacob Pan 2016-11-14 11:08:45 -08:00 committed by Zhang Rui
parent b58ec8b582
commit ec638db8cb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/thermal/intel_powerclamp.c
View File

@ -669,9 +669,16 @@ static struct thermal_cooling_device_ops powerclamp_cooling_ops = {
.set_cur_state = powerclamp_set_cur_state, .set_cur_state = powerclamp_set_cur_state,
}; };
static const struct x86_cpu_id __initconst intel_powerclamp_ids[] = {
{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_MWAIT },
{}
};
MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids);
static int __init powerclamp_probe(void) static int __init powerclamp_probe(void)
{ {
if (!boot_cpu_has(X86_FEATURE_MWAIT)) {
if (!x86_match_cpu(intel_powerclamp_ids)) {
pr_err("CPU does not support MWAIT"); pr_err("CPU does not support MWAIT");
return -ENODEV; return -ENODEV;
} }