Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec638db8 authored by Jacob Pan's avatar Jacob Pan Committed by Zhang Rui
Browse files

thermal/powerclamp: add back module device table 



Commit 3105f234 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: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent b58ec8b5

drivers/thermal/intel_powerclamp.c

+8 −1
Original line number Diff line number Diff line
@@ -669,9 +669,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;

	}