Skip to contentSkip to conversation

ARM: shmobile: APMU: Move the shmobile_smp_hook call

PATCH In review keita kobayashi 1 participant 1 message Aug 1, 2014

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

keita kobayashi

author
#0 lore raw

PATCH 1/6 ARM: shmobile: APMU: Move the shmobile_smp_hook call

shmobile_smp_hook() in shmobile_smp_apmu_do_suspend() is used in case of Suspend to RAM sequence. So, This patch move shmobile_smp_hook() call to shmobile_smp_apmu_enter_suspend() for Suspend to RAM.

Signed-off-by Keita Kobayashi <[email protected]>
---
 arch/arm/mach-shmobile/platsmp-apmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-shmobile/platsmp-apmu.c +1 -1
index 2c06810..ad6a383 100644
@@ -227,7 +227,6 @@ int shmobile_smp_apmu_cpu_kill(unsigned int cpu)
 #if defined(CONFIG_SUSPEND)
 static int shmobile_smp_apmu_do_suspend(unsigned long cpu)
 {
-	shmobile_smp_hook(cpu, virt_to_phys(cpu_resume), 0);
 	shmobile_smp_apmu_cpu_shutdown(cpu);
 	cpu_do_idle(); /* WFI selects Core Standby */
 	return 1;

@@ -235,6 +234,7 @@ static int shmobile_smp_apmu_do_suspend(unsigned long cpu)
 
 static int shmobile_smp_apmu_enter_suspend(suspend_state_t state)
 {
+	shmobile_smp_hook(smp_processor_id(), virt_to_phys(cpu_resume), 0);
 	cpu_suspend(smp_processor_id(), shmobile_smp_apmu_do_suspend);
 	cpu_leave_lowpower();
 	return 0;
Signature · 1 line
1.7.9.5