Commit 23400ac9 authored Nov 22, 2016 by Linus Torvalds

linux

Pull thermal management fix from Zhang Rui:
 "We only have one urgent fix this time.

  Commit 3105f234 ("thermal/powerclamp: correct cpu support check"),
  which is shipped in 4.9-rc3, fixed a problem introduced by commit
  b721ca0d ("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

parents b66c08ba ec638db8

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;
		}