diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 09:29:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 09:29:42 -0800 |
| commit | 77bd2adb97271c5f2237cfacf5984cc810033131 (patch) | |
| tree | 77b30ef19a5d0581c02e3d23c553492c1c277c25 /drivers/base/power/main.c | |
| parent | 754ac45745711a7ce0067087e5b55a9c277952ad (diff) | |
| parent | d4faadd5d5b368a7051fef374ee933ec3606713b (diff) | |
Merge tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixup from Rafael Wysocki:
"This reverts two cpufreq commits that fixed issues for some people,
but broke things for others, so revert them and we'll need to fix the
original problems differently"
* tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "cpufreq: fix garbage kobjects on errors during suspend/resume"
Revert "cpufreq: suspend governors on system suspend/hibernate"
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index e3219dfd736..1b41fca3d65 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -29,7 +29,6 @@ #include <linux/async.h> #include <linux/suspend.h> #include <trace/events/power.h> -#include <linux/cpufreq.h> #include <linux/cpuidle.h> #include <linux/timer.h> @@ -541,7 +540,6 @@ static void dpm_resume_noirq(pm_message_t state) dpm_show_time(starttime, state, "noirq"); resume_device_irqs(); cpuidle_resume(); - cpufreq_resume(); } /** @@ -957,7 +955,6 @@ static int dpm_suspend_noirq(pm_message_t state) ktime_t starttime = ktime_get(); int error = 0; - cpufreq_suspend(); cpuidle_pause(); suspend_device_irqs(); mutex_lock(&dpm_list_mtx); |