diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-07 16:06:47 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-13 20:55:52 -0800 |
| commit | 43ac41c21bcb8a8f480b17aec4ab658d388b6098 (patch) | |
| tree | dbf686c4f15a7e7a67fbf9ce1f87c7017abebb78 /arch/arm/plat-samsung | |
| parent | 46c08ea5cb8e40c44a25b91204c09a721c9896fb (diff) | |
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 <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/68652
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
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(); |