aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorjohn stultz <johnstul@us.ibm.com>2006-06-26 03:25:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 12:58:20 -0400
commitad596171ed635c51a9eef829187af100cbf8dcf7 (patch)
tree24b19bec1b1abd8bd110064226569aa42dde0b3b /include/linux
parent734efb467b31e56c2f9430590a9aa867ecf3eea1 (diff)
[PATCH] Time: Use clocksource infrastructure for update_wall_time
Modify the update_wall_time function so it increments time using the clocksource abstraction instead of jiffies. Since the only clocksource driver currently provided is the jiffies clocksource, this should result in no functional change. Additionally, a timekeeping_init and timekeeping_resume function has been added to initialize and maintain some of the new timekeping state. [hirofumi@mail.parknet.co.jp: fixlet] Signed-off-by: John Stultz <johnstul@us.ibm.com> Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/time.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index 0cd696cee998..88d3b812841e 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -77,6 +77,8 @@ extern struct timespec xtime;
77extern struct timespec wall_to_monotonic; 77extern struct timespec wall_to_monotonic;
78extern seqlock_t xtime_lock; 78extern seqlock_t xtime_lock;
79 79
80void timekeeping_init(void);
81
80static inline unsigned long get_seconds(void) 82static inline unsigned long get_seconds(void)
81{ 83{
82 return xtime.tv_sec; 84 return xtime.tv_sec;