evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "lpm-levels: Use arm_cpuidle_suspend instead of cpu_suspend"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-11 12:48:57 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3f1515770c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/cpuidle/lpm-levels.c
View file

@ -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);