vserver 1.9.3

[linux-2.6.git] / arch / arm / mach-pxa / pm.c

diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 245e25b..5e84864 100644 (file)
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -19,7 +19,9 @@
 #include <asm/hardware.h>
 #include <asm/memory.h>
 #include <asm/system.h>
+#include <asm/arch/pxa-regs.h>
 #include <asm/arch/lubbock.h>
+#include <asm/mach/time.h>
 
 
 /*
@@ -45,7 +47,7 @@ extern void pxa_cpu_resume(void);
  */
 enum { SLEEP_SAVE_START = 0,
 
-       SLEEP_SAVE_OSCR, SLEEP_SAVE_OIER,
+       SLEEP_SAVE_OIER,
        SLEEP_SAVE_OSMR0, SLEEP_SAVE_OSMR1, SLEEP_SAVE_OSMR2, SLEEP_SAVE_OSMR3,
 
        SLEEP_SAVE_GPLR0, SLEEP_SAVE_GPLR1, SLEEP_SAVE_GPLR2,
@@ -68,17 +70,18 @@ static int pxa_pm_enter(u32 state)
 {
        unsigned long sleep_save[SLEEP_SAVE_SIZE];
        unsigned long checksum = 0;
-       unsigned long delta;
+       struct timespec delta, rtc;
        int i;
 
        if (state != PM_SUSPEND_MEM)
                return -EINVAL;
 
        /* preserve current time */
-       delta = xtime.tv_sec - RCNR;
+       rtc.tv_sec = RCNR;
+       rtc.tv_nsec = 0;
+       save_time_delta(&delta, &rtc);
 
        /* save vital registers */
-       SAVE(OSCR);
        SAVE(OSMR0);
        SAVE(OSMR1);
        SAVE(OSMR2);
@@ -149,9 +152,11 @@ static int pxa_pm_enter(u32 state)
        RESTORE(OSMR1);
        RESTORE(OSMR2);
        RESTORE(OSMR3);
-       RESTORE(OSCR);
        RESTORE(OIER);
 
+       /* OSMR0 is the system timer: make sure OSCR is sufficiently behind */
+       OSCR = OSMR0 - LATCH;
+
        RESTORE(CKEN);
 
        ICLR = 0;
@@ -159,7 +164,8 @@ static int pxa_pm_enter(u32 state)
        RESTORE(ICMR);
 
        /* restore current time */
-       xtime.tv_sec = RCNR + delta;
+       rtc.tv_sec = RCNR;
+       restore_time_delta(&delta, &rtc);
 
 #ifdef DEBUG
        printk(KERN_DEBUG "*** made it back from resume\n");