Re: 2.6.9 S4: clock not updated after resume

[Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>]

Hi!

> I use with success 'echo disk > /sys/power/state' on my ASUS M6N (BIOS
> 0210A), Debian /experimental/, vanilla 2.6.9, XFree86/GNOME, with all
> the modules installed (i.e, ALSA, bcm5700, ipw2100, USB, radeonfb, AGP/DRM).
> 
> The resume is always ok, even if I suspend from battery or from AC,
> there're no problem at all. The only remark is that the internal clock
> is 'freezed' at the time I suspended the machine and I must re-update it
> using the NTP service. This is not so problematic if your machine is
> always connected to Internet, but as sometimes I work offline, I should
> re-update the internal clock by hand.

It is a bug, here's the fix.

									Pavel
--- clean/arch/i386/kernel/time.c	2004-10-01 00:29:59.000000000 +0200
+++ linux/arch/i386/kernel/time.c	2004-10-19 15:16:14.000000000 +0200
@@ -319,7 +319,7 @@
 	return retval;
 }
 
-static long clock_cmos_diff;
+static long clock_cmos_diff, sleep_start;
 
 static int time_suspend(struct sys_device *dev, u32 state)
 {
@@ -328,6 +328,7 @@
 	 */
 	clock_cmos_diff = -get_cmos_time();
 	clock_cmos_diff += get_seconds();
+	sleep_start = get_cmos_time();
 	return 0;
 }
 
@@ -335,10 +336,13 @@
 {
 	unsigned long flags;
 	unsigned long sec = get_cmos_time() + clock_cmos_diff;
+	unsigned long sleep_length = get_cmos_time() - sleep_start;
+
 	write_seqlock_irqsave(&xtime_lock, flags);
 	xtime.tv_sec = sec;
 	xtime.tv_nsec = 0;
 	write_sequnlock_irqrestore(&xtime_lock, flags);
+	jiffies += sleep_length * HZ;
 	return 0;
 }
 


-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!


-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl