diff options
author | John Stultz <johnstul@us.ibm.com> | 2007-02-16 04:27:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:13:57 -0500 |
commit | 411187fb05cd11676b0979d9fbf3291db69dbce2 (patch) | |
tree | 6202ca36868ab47edf737de81c7b7c4841228ab3 /include/linux | |
parent | 9f907c0144496e464bd5ed5a99a51227d63a9c0b (diff) |
[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/linux')
-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 fca93025ab51..660d91dea78c 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -146,6 +146,9 @@ extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, | |||
146 | /* Soft interrupt function to run the hrtimer queues: */ | 146 | /* Soft interrupt function to run the hrtimer queues: */ |
147 | extern void hrtimer_run_queues(void); | 147 | extern void hrtimer_run_queues(void); |
148 | 148 | ||
149 | /* Resume notification */ | ||
150 | void hrtimer_notify_resume(void); | ||
151 | |||
149 | /* Bootup initialization: */ | 152 | /* Bootup initialization: */ |
150 | extern void __init hrtimers_init(void); | 153 | extern void __init hrtimers_init(void); |
151 | 154 | ||
diff --git a/include/linux/time.h b/include/linux/time.h index eceb1a59b078..8ea8dea713c7 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -92,6 +92,7 @@ extern struct timespec xtime; | |||
92 | extern struct timespec wall_to_monotonic; | 92 | extern struct timespec wall_to_monotonic; |
93 | extern seqlock_t xtime_lock __attribute__((weak)); | 93 | extern seqlock_t xtime_lock __attribute__((weak)); |
94 | 94 | ||
95 | extern unsigned long read_persistent_clock(void); | ||
95 | void timekeeping_init(void); | 96 | void timekeeping_init(void); |
96 | 97 | ||
97 | static inline unsigned long get_seconds(void) | 98 | static inline unsigned long get_seconds(void) |