diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:57 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:57 +0200 |
| commit | 27a513ca8600e96790f9f3a3c3182da947e569d2 (patch) | |
| tree | 48319c0a53dd76dc2dff6cb15da5c5f145e72cc3 /drivers | |
| parent | ARM: 8383/1: nommu: avoid deprecated source register on mov (diff) | |
| parent | Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-27a513ca8600e96790f9f3a3c3182da947e569d2.tar.xz linux-27a513ca8600e96790f9f3a3c3182da947e569d2.zip | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpuidle/cpuidle-big_little.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/cpuidle/cpuidle-big_little.c b/drivers/cpuidle/cpuidle-big_little.c index 40c34faffe59..db2ede565f1a 100644 --- a/drivers/cpuidle/cpuidle-big_little.c +++ b/drivers/cpuidle/cpuidle-big_little.c @@ -108,13 +108,7 @@ static int notrace bl_powerdown_finisher(unsigned long arg) unsigned int cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); mcpm_set_entry_vector(cpu, cluster, cpu_resume); - - /* - * Residency value passed to mcpm_cpu_suspend back-end - * has to be given clear semantics. Set to 0 as a - * temporary value. - */ - mcpm_cpu_suspend(0); + mcpm_cpu_suspend(); /* return value != 0 means failure */ return 1; |