From 747f4d38476848e9c4e34efb0dba810a3df40c48 Mon Sep 17 00:00:00 2001 From: Jacob Pan Date: Thu, 13 Apr 2017 10:24:00 +0200 Subject: [PATCH] thermal/powerclamp: add back module device table BugLink: https://bugs.launchpad.net/bugs/1591641 Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 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 Signed-off-by: Zhang Rui (cherry picked from commit ec638db8cb9ddd5ca08b23f2835b6c9c15eb616d) Signed-off-by: Kai-Heng Feng Acked-by: Seth Forshee Acked-by: Colin King Signed-off-by: Stefan Bader --- drivers/thermal/intel_powerclamp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c index 4b61c89b42d3..5306add74838 100644 --- a/drivers/thermal/intel_powerclamp.c +++ b/drivers/thermal/intel_powerclamp.c @@ -666,9 +666,16 @@ static struct thermal_cooling_device_ops powerclamp_cooling_ops = { .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) { - if (!boot_cpu_has(X86_FEATURE_MWAIT)) { + + if (!x86_match_cpu(intel_powerclamp_ids)) { pr_err("CPU does not support MWAIT"); return -ENODEV; } -- 2.39.5