summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLeela Krishna Amudala <leela.krishna@linaro.org>2014-05-28 00:43:21 +0900
committerKukjin Kim <kgene.kim@samsung.com>2014-06-17 00:23:28 +0900
commitb92ad209c26a1891c4e04cd75fc771dcb002603f (patch)
tree8d8df78d3b94d1b8d3a833c729852a6042d32e12 /arch
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
downloadlinux-stable-b92ad209c26a1891c4e04cd75fc771dcb002603f.tar.gz
linux-stable-b92ad209c26a1891c4e04cd75fc771dcb002603f.tar.bz2
linux-stable-b92ad209c26a1891c4e04cd75fc771dcb002603f.zip
ARM: EXYNOS: Use wfi macro in platform_do_lowpower
This patch is originally based on commit b3377d186572 ("ARM: 7064/1: vexpress: Use wfi macro in platform_do_lowpower.") Current Exynos CPU hotplug code includes a hardcoded WFI instruction, in ARM encoding. When the kernel is compiled in Thumb-2 mode, this is invalid and causes the machine to hang hard when a CPU is offlined. Use wfi macro instead of the hardcoded WFI instruction. Signed-off-by: Leela Krishna Amudala <leela.krishna@linaro.org> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-exynos/hotplug.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
index 69fa48397394..8a134d019cb3 100644
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@ -46,13 +46,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
if (cpu == 1)
exynos_cpu_power_down(cpu);
- /*
- * here's the WFI
- */
- asm(".word 0xe320f003\n"
- :
- :
- : "memory", "cc");
+ wfi();
if (pen_release == cpu_logical_map(cpu)) {
/*