]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-cpufreq-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:41:30 +0000 (18:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:41:30 +0000 (18:41 +0200)
* pm-cpufreq-next: (27 commits)
  cpufreq: s5pv210: drop check for CONFIG_PM_VERBOSE
  cpufreq: intel_pstate: Remove unused member name of cpudata
  cpufreq: Break out early when frequency equals target_freq
  cpufreq: Tegra: drop wrapper around tegra_update_cpu_speed()
  cpufreq: imx6q: Remove unused include
  cpufreq: imx6q: Drop devm_clk/regulator_get usage
  cpufreq: powernow-k8: Suppress checkpatch warnings
  cpufreq: powernv: make local function static
  cpufreq: Enable big.LITTLE cpufreq driver on arm64
  cpufreq: nforce2: remove DEFINE_PCI_DEVICE_TABLE macro
  intel_pstate: Add CPU IDs for Broadwell processors
  cpufreq: Fix build error on some platforms that use cpufreq_for_each_*
  PM / OPP: Move cpufreq specific OPP functions out of generic OPP library
  PM / OPP: Remove cpufreq wrapper dependency on internal data organization
  cpufreq: Catch double invocations of cpufreq_freq_transition_begin/end
  intel_pstate: Remove sample parameter in intel_pstate_calc_busy
  cpufreq: Kconfig: Fix spelling errors
  cpufreq: Make linux-pm@vger.kernel.org official mailing list
  cpufreq: exynos: Use dev_err/info function instead of pr_err/info
  sh: clk: Use cpufreq_for_each_valid_entry macro for iteration
  ...

Conflicts:
arch/mips/loongson/lemote-2f/clock.c

1  2 
MAINTAINERS
drivers/base/power/opp.c
drivers/cpufreq/intel_pstate.c
tools/power/cpupower/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
index eab8ccfe6bebed652b8fec4849a5fc9fb67d82f3,bfe4280399bc58e71d5250815d8527c0cad7d4ac..a6d5afa85009541d37cf39ea0704fcf9f7190366
@@@ -554,12 -539,17 +548,12 @@@ static void intel_pstate_get_cpu_pstate
  
        if (pstate_funcs.get_vid)
                pstate_funcs.get_vid(cpu);
 -
 -      /*
 -       * goto max pstate so we don't slow up boot if we are built-in if we are
 -       * a module we will take care of it during normal operation
 -       */
 -      intel_pstate_set_pstate(cpu, cpu->pstate.max_pstate);
 +      intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
  }
  
- static inline void intel_pstate_calc_busy(struct cpudata *cpu,
-                                       struct sample *sample)
+ static inline void intel_pstate_calc_busy(struct cpudata *cpu)
  {
+       struct sample *sample = &cpu->sample;
        int32_t core_pct;
        int32_t c0_pct;
  
Simple merge