From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 5 Aug 2016 13:46:55 +0000 (+0200)
Subject: Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e2b3b80de5cda284c885721e873f9a6e90f68ef8;p=linux.git

Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'

* 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
---

e2b3b80de5cda284c885721e873f9a6e90f68ef8
diff --cc drivers/cpufreq/intel_pstate.c
index 9ec033b4f2d9d,fe9dc17ea8733,b5cafb73c59ac,fe9dc17ea8733,1fa1a32928d70..be9eade147f23
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@@@@@ -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),
     	{}
     };