From 43ac41c21bcb8a8f480b17aec4ab658d388b6098 Mon Sep 17 00:00:00 2001 From: Varun Wadekar Date: Wed, 7 Dec 2011 16:06:47 +0530 Subject: Revert "ARM: pm: move cpu_init() call into core code" This reverts commit 14cd8fd574bce1cfbe510ccb1f73c7c1024d770f. Conflicts: arch/arm/kernel/sleep.S Bug 911002 Change-Id: I814e25bb8c4ae5b5351fd2bec58d57c9d86ef429 Signed-off-by: Varun Wadekar Reviewed-on: http://git-master/r/68652 Reviewed-by: Mayuresh Kulkarni --- arch/arm/plat-samsung/pm.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/plat-samsung') diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index ae6f99834cdd..138e24774f70 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c @@ -302,6 +302,10 @@ static int s3c_pm_enter(suspend_state_t state) cpu_suspend(0, pm_cpu_sleep); + /* restore the cpu state using the kernel's cpu init code. */ + + cpu_init(); + /* restore the system state */ s3c_pm_restore_core(); -- cgit v1.2.3