diff options
| author | Shaohua Li | 2005-09-04 00:57:07 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-05 09:06:18 +0200 |
| commit | c3c433e4f33afe255389ba3b1a003dc8deb3de9a (patch) | |
| tree | 071304e15e21e0a93c17050000a682f4ae1a98c1 /include/asm-i386/timer.h | |
| parent | [PATCH] pm: clean up /sys/power/disk (diff) | |
| download | kernel-qcow2-linux-c3c433e4f33afe255389ba3b1a003dc8deb3de9a.tar.gz kernel-qcow2-linux-c3c433e4f33afe255389ba3b1a003dc8deb3de9a.tar.xz kernel-qcow2-linux-c3c433e4f33afe255389ba3b1a003dc8deb3de9a.zip | |
[PATCH] add suspend/resume for timer
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>
Diffstat (limited to 'include/asm-i386/timer.h')
| -rw-r--r-- | include/asm-i386/timer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h index dcf1e07db08a..aed16437479d 100644 --- a/include/asm-i386/timer.h +++ b/include/asm-i386/timer.h @@ -1,6 +1,7 @@ #ifndef _ASMi386_TIMER_H #define _ASMi386_TIMER_H #include <linux/init.h> +#include <linux/pm.h> /** * struct timer_ops - used to define a timer source @@ -23,6 +24,8 @@ struct timer_opts { unsigned long long (*monotonic_clock)(void); void (*delay)(unsigned long); unsigned long (*read_timer)(void); + int (*suspend)(pm_message_t state); + int (*resume)(void); }; struct init_timer_opts { |