diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-11 12:48:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-11 12:48:56 -0700 |
| commit | 3f1515770c7e18b268b455426e989833b3cb0e2f (patch) | |
| tree | 3d3dc4f352a15ec9cd6adc6d6d83bb8dbd325237 /drivers | |
| parent | b0e3a3b7186ee215d714c846595335687a096c52 (diff) | |
| parent | 997f6b993accd764a334a47b3395dbb8048fdd0d (diff) | |
Merge "lpm-levels: Use arm_cpuidle_suspend instead of cpu_suspend"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpuidle/lpm-levels.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpuidle/lpm-levels.c b/drivers/cpuidle/lpm-levels.c index 3f8a3927ff92..2b0df3f0e04e 100644 --- a/drivers/cpuidle/lpm-levels.c +++ b/drivers/cpuidle/lpm-levels.c @@ -44,6 +44,7 @@ #include <asm/arch_timer.h> #include <asm/cacheflush.h> #include <asm/suspend.h> +#include <asm/cpuidle.h> #include "lpm-levels.h" #include "lpm-workarounds.h" #include <trace/events/power.h> @@ -914,7 +915,6 @@ unlock_and_return: } #if !defined(CONFIG_CPU_V7) -#include <asm/cpuidle.h> asmlinkage int __invoke_psci_fn_smc(u64, u64, u64, u64); bool psci_enter_sleep(struct lpm_cluster *cluster, int idx, bool from_idle) { @@ -976,7 +976,7 @@ bool psci_enter_sleep(struct lpm_cluster *cluster, int idx, bool from_idle) update_debug_pc_event(CPU_ENTER, state_id, 0xdeaffeed, 0xdeaffeed, true); stop_critical_timings(); - success = !cpu_suspend(state_id); + success = !arm_cpuidle_suspend(state_id); start_critical_timings(); update_debug_pc_event(CPU_EXIT, state_id, success, 0xdeaffeed, true); |