diff options
| author | Linus Torvalds | 2017-03-03 02:33:52 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-03-03 02:33:52 +0100 |
| commit | 080e4168c0834ccc853c48259e16a5c556c7ecba (patch) | |
| tree | 641a264718c6f1b8bf9525e4e4a073565044cd03 /drivers/cpufreq/qoriq-cpufreq.c | |
| parent | Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep' (diff) | |
| download | kernel-qcow2-linux-080e4168c0834ccc853c48259e16a5c556c7ecba.tar.gz kernel-qcow2-linux-080e4168c0834ccc853c48259e16a5c556c7ecba.tar.xz kernel-qcow2-linux-080e4168c0834ccc853c48259e16a5c556c7ecba.zip | |
Merge tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more power management updates deom Rafael Wysocki:
"These fix two bugs introduced by recent power management updates (in
the cpuidle menu governor and intel_pstate) and a few other issues,
clean up things and remove unused code.
Specifics:
- Fix for a cpuidle menu governor problem that started to take an
unnecessary spinlock after one of the recent updates and that did
not play well with the RT patch (Rafael Wysocki).
- Fix for the new intel_pstate operation mode switching feature added
recently that did not reinitialize P-state limits properly when
switching operation modes (Rafael Wysocki).
- Removal of unused global notifiers from the PM QoS framework
(Viresh Kumar).
- Generic power domains framework update to make it handle
asynchronous invocations of PM callbacks in the "noirq" phases of
system suspend/hibernation correctly (Ulf Hansson).
- Two hibernation core cleanups (Rafael Wysocki).
- intel_idle cleanup related to the sysfs interface (Len Brown).
- Off-by-one bug fix in the OPP (Operating Performance Points)
framework (Andrzej Hajda).
- OPP framework's documentation fix (Viresh Kumar).
- cpufreq qoriq driver cleanup (Tang Yuantian).
- Fixes for typos in comments in the device runtime PM framework
(Christophe Jaillet)"
* tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / OPP: Documentation: Fix opp-microvolt in examples
intel_idle: stop exposing platform acronyms in sysfs
cpufreq: intel_pstate: Fix limits issue with operation mode switching
PM / hibernate: Define pr_fmt() and use pr_*() instead of printk()
PM / hibernate: Untangle power_down()
cpuidle: menu: Avoid taking spinlock for accessing QoS values
PM / QoS: Remove global notifiers
PM / runtime: Fix some typos
cpufreq: qoriq: clean up unused code
PM / OPP: fix off-by-one bug in dev_pm_opp_get_max_volt_latency loop
PM / Domains: Power off masters immediately in the power off sequence
PM / Domains: Rename is_async to one_dev_on for genpd_power_off()
PM / Domains: Move genpd_power_off() above genpd_power_on()
Diffstat (limited to 'drivers/cpufreq/qoriq-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/qoriq-cpufreq.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c index a6fefac8afe4..bfec1bcd3835 100644 --- a/drivers/cpufreq/qoriq-cpufreq.c +++ b/drivers/cpufreq/qoriq-cpufreq.c @@ -23,10 +23,6 @@ #include <linux/slab.h> #include <linux/smp.h> -#if !defined(CONFIG_ARM) -#include <asm/smp.h> /* for get_hard_smp_processor_id() in UP configs */ -#endif - /** * struct cpu_data * @pclk: the parent clock of cpu |