diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2005-09-03 15:57:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:06:18 -0700 |
| commit | c3c433e4f33afe255389ba3b1a003dc8deb3de9a (patch) | |
| tree | 071304e15e21e0a93c17050000a682f4ae1a98c1 /include | |
| parent | 57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919 (diff) | |
| download | linux-c3c433e4f33afe255389ba3b1a003dc8deb3de9a.tar.gz | |
[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')
| -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 dcf1e07db08a7..aed16437479d9 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 { |