From: john stultz This should merge TOD my changes with Atsushi's jiffies/jiffies_64 fix that is in your tree. Signed-off-by: John Stultz Signed-off-by: Andrew Morton --- arch/i386/kernel/time.c | 3 +++ 1 files changed, 3 insertions(+) diff -puN arch/i386/kernel/time.c~time-i386-conversion-part-3-lock-jiffies_64 arch/i386/kernel/time.c --- devel/arch/i386/kernel/time.c~time-i386-conversion-part-3-lock-jiffies_64 2006-03-04 02:26:49.000000000 -0800 +++ devel-akpm/arch/i386/kernel/time.c 2006-03-04 02:26:49.000000000 -0800 @@ -266,6 +266,7 @@ static int timer_suspend(struct sys_devi static int timer_resume(struct sys_device *dev) { + unsigned long flags; unsigned long sec; unsigned long sleep_length; @@ -276,8 +277,10 @@ static int timer_resume(struct sys_devic setup_pit_timer(); sec = get_cmos_time() + clock_cmos_diff; sleep_length = (get_cmos_time() - sleep_start) * HZ; + write_seqlock_irqsave(&xtime_lock, flags); jiffies_64 += sleep_length; wall_jiffies += sleep_length; + write_sequnlock_irqrestore(&xtime_lock, flags); touch_softlockup_watchdog(); return 0; } _