diff options
author | John Stultz <johnstul@us.ibm.com> | 2007-02-16 01:27:30 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 08:13:57 -0800 |
commit | 411187fb05cd11676b0979d9fbf3291db69dbce2 (patch) | |
tree | 6202ca36868ab47edf737de81c7b7c4841228ab3 /include | |
parent | 9f907c0144496e464bd5ed5a99a51227d63a9c0b (diff) | |
download | op-kernel-dev-411187fb05cd11676b0979d9fbf3291db69dbce2.zip op-kernel-dev-411187fb05cd11676b0979d9fbf3291db69dbce2.tar.gz |
[PATCH] GTOD: persistent clock support
Persistent clock support: do proper timekeeping across suspend/resume.
[bunk@stusta.de: cleanup]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hrtimer.h | 3 | ||||
-rw-r--r-- | include/linux/time.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index fca9302..660d91d 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -146,6 +146,9 @@ extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, /* Soft interrupt function to run the hrtimer queues: */ extern void hrtimer_run_queues(void); +/* Resume notification */ +void hrtimer_notify_resume(void); + /* Bootup initialization: */ extern void __init hrtimers_init(void); diff --git a/include/linux/time.h b/include/linux/time.h index eceb1a5..8ea8dea 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -92,6 +92,7 @@ extern struct timespec xtime; extern struct timespec wall_to_monotonic; extern seqlock_t xtime_lock __attribute__((weak)); +extern unsigned long read_persistent_clock(void); void timekeeping_init(void); static inline unsigned long get_seconds(void) |