Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fix from Zhang Rui: "We only have one urgent fix this time. Commithifive-unleashed-5.13105f234e0
("thermal/powerclamp: correct cpu support check"), which is shipped in 4.9-rc3, fixed a problem introduced by commitb721ca0d19
("thermal/powerclamp: remove cpu whitelist"). But unfortunately, it broke intel_powerclamp driver module auto- loading at the same time. Thus we need this change to add back module auto-loading for 4.9" * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal/powerclamp: add back module device table
commit
23400ac997
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue