diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-12-19 17:57:51 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-12-19 17:57:51 +0000 |
| commit | 0a5be743e8c3c3230600fbc0cf923fb5dbefd579 (patch) | |
| tree | 239236cda1f31532831af7b3214b1db6c398221c /arch/arm64/kernel/process.c | |
| parent | 6ac2104debc235b745265b64d610237a6833fd53 (diff) | |
| parent | 1307220d7bb79fc526d006f854ebfd2bf44e6e87 (diff) | |
| download | linux-stable-0a5be743e8c3c3230600fbc0cf923fb5dbefd579.tar.gz linux-stable-0a5be743e8c3c3230600fbc0cf923fb5dbefd579.tar.bz2 linux-stable-0a5be743e8c3c3230600fbc0cf923fb5dbefd579.zip | |
Merge tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp into upstream
* tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp:
arm64: add CPU power management menu/entries
arm64: kernel: add PM build infrastructure
arm64: kernel: add CPU idle call
arm64: enable generic clockevent broadcast
arm64: kernel: implement HW breakpoints CPU PM notifier
arm64: kernel: refactor code to install/uninstall breakpoints
arm: kvm: implement CPU PM notifier
arm64: kernel: implement fpsimd CPU PM notifier
arm64: kernel: cpu_{suspend/resume} implementation
arm64: kernel: suspend/resume registers save/restore
arm64: kernel: build MPIDR_EL1 hash function data structure
arm64: kernel: add MPIDR_EL1 accessors macros
Conflicts:
arch/arm64/Kconfig
Diffstat (limited to 'arch/arm64/kernel/process.c')
| -rw-r--r-- | arch/arm64/kernel/process.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 0adb8f0f4549..248a15db37f2 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -33,6 +33,7 @@ #include <linux/kallsyms.h> #include <linux/init.h> #include <linux/cpu.h> +#include <linux/cpuidle.h> #include <linux/elfcore.h> #include <linux/pm.h> #include <linux/tick.h> @@ -98,8 +99,10 @@ void arch_cpu_idle(void) * This should do all the clock switching and wait for interrupt * tricks */ - cpu_do_idle(); - local_irq_enable(); + if (cpuidle_idle_call()) { + cpu_do_idle(); + local_irq_enable(); + } } #ifdef CONFIG_HOTPLUG_CPU |