summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorjohn stultz <johnstul@us.ibm.com>2006-06-26 00:25:06 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:20 -0700
commitad596171ed635c51a9eef829187af100cbf8dcf7 (patch)
tree24b19bec1b1abd8bd110064226569aa42dde0b3b /kernel/time
parent734efb467b31e56c2f9430590a9aa867ecf3eea1 (diff)
downloadlinux-ad596171ed635c51a9eef829187af100cbf8dcf7.tar.bz2
[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 'kernel/time')
-rw-r--r--kernel/time/clocksource.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 95dd2200a109..4288bfa12c3f 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -56,7 +56,7 @@ static int finished_booting;
*
* Hack to avoid lots of clocksource churn at boot time
*/
-static int clocksource_done_booting(void)
+static int __init clocksource_done_booting(void)
{
finished_booting = 1;
return 0;
@@ -289,7 +289,7 @@ static struct sys_device device_clocksource = {
.cls = &clocksource_sysclass,
};
-static int init_clocksource_sysfs(void)
+static int __init init_clocksource_sysfs(void)
{
int error = sysdev_class_register(&clocksource_sysclass);