Merge linux-2.6 with linux-acpi-2.6

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index 13a48ee77484..fe57d966a34d 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -585,14 +585,16 @@ static int s3c2410_pm_enter(suspend_state_t state)
 
         s3c2410_pm_check_store();
 
-        // need to make some form of time-delta
-
         /* send the cpu to sleep... */
 
         __raw_writel(0x00, S3C2410_CLKCON);  /* turn off clocks over sleep */
 
         s3c2410_cpu_suspend(regs_save);
 
+        /* restore the cpu state */
+
+        cpu_init();
+
         /* unset the return-from-sleep flag, to ensure reset */
 
         tmp = __raw_readl(S3C2410_GSTATUS2);