]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Aug 2016 13:46:55 +0000 (15:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Aug 2016 13:46:55 +0000 (15:46 +0200)
* pm-sleep:
  x86/power/64: Do not refer to __PAGE_OFFSET from assembly code

* pm-cpufreq:
  cpufreq: Do not default-yes CPU_FREQ_STAT
  cpufreq: intel_pstate: Add more out-of-band IDs

* pm-core:
  PM-wakeup: Delete unnecessary checks before three function calls

* pm-opp:
  PM / OPP: optimize dev_pm_opp_set_rate() performance a bit

1  2  3  4  5 
drivers/cpufreq/intel_pstate.c

index 9ec033b4f2d9d6693a5d0139da92c5a8e2b22ab1,fe9dc17ea8733b6c691502c74f9a10ad88f97c88,b5cafb73c59ac821cfea4f6fb2876953020f4762,fe9dc17ea8733b6c691502c74f9a10ad88f97c88,1fa1a32928d70a30050b30ca2d6eef4aea62d8e3..be9eade147f2335c056e0fc3c4297528330961b5
@@@@@@ -1372,8 -1355,8 -1372,10 -1355,8 -1355,8 +1372,10 @@@@@@ static const struct x86_cpu_id intel_ps
     };
     MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
     
 - --static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] = {
 - --   ICPU(0x56, core_params),
 + ++static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {
 + ++   ICPU(INTEL_FAM6_BROADWELL_XEON_D, core_params),
++ ++   ICPU(INTEL_FAM6_BROADWELL_X, core_params),
++ ++   ICPU(INTEL_FAM6_SKYLAKE_X, core_params),
        {}
     };