Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
Commit 3105f234e0ab ("thermal/powerclamp: correct cpu support check"),
which is shipped in 4.9-rc3, fixed a problem introduced by commit
b721ca0d1927 ("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
+8
-1
+8
-1
drivers/thermal/intel_powerclamp.c
+8
-1
drivers/thermal/intel_powerclamp.c
···
669
669
.set_cur_state = powerclamp_set_cur_state,
670
670
};
671
671
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
+
672
678
static int __init powerclamp_probe(void)
673
679
{
674
-
if (!boot_cpu_has(X86_FEATURE_MWAIT)) {
680
+
681
+
if (!x86_match_cpu(intel_powerclamp_ids)) {
675
682
pr_err("CPU does not support MWAIT");
676
683
return -ENODEV;
677
684
}