lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] add suspend/resume for timer

Browse Source 
The timers lack .suspend/.resume methods.  Because of this, jiffies got a
big compensation after a S3 resume.  And then softlockup watchdog reports
an oops.  This occured with HPET enabled, but it's also possible for other
timers.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Shaohua Li
2005-09-03 15:57:07 -07:00
committed by Linus Torvalds
parent 57c4ce3cbf
commit c3c433e4f3
6 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/i386/kernel/timers/timer_pm.c
View File

@@ -186,6 +186,14 @@ static void mark_offset_pmtmr(void)
}
}
static int pmtmr_resume(void)
{
write_seqlock(&monotonic_lock);
/* Assume this is the last mark offset time */
offset_tick = read_pmtmr();
write_sequnlock(&monotonic_lock);
return 0;
}
static unsigned long long monotonic_clock_pmtmr(void)
{
@@ -247,6 +255,7 @@ static struct timer_opts timer_pmtmr = {
.monotonic_clock = monotonic_clock_pmtmr,
.delay = delay_pmtmr,
.read_timer = read_timer_tsc,
.resume = pmtmr_resume,
};
struct init_timer_opts __initdata timer_pmtmr_init = {