aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorjohn stultz <johnstul@us.ibm.com>2006-06-26 00:25:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:21 -0700
commita275254975a29c51929ee175b92ac471ac2a0043 (patch)
tree42ec41bf74c0c601f05ed12ff674539f4bf6f505 /kernel/timer.c
parent5d0cf410e94b1f1ff852c3f210d22cc6c5a27ffa (diff)
[PATCH] time: rename clocksource functions
As suggested by Roman Zippel, change clocksource functions to use clocksource_xyz rather then xyz_clocksource to avoid polluting the namespace. Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index e5adb9e2e7a7..890a56937cfa 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -810,7 +810,7 @@ static inline s64 __get_nsec_offset(void)
s64 ns_offset;
/* read clocksource: */
- cycle_now = read_clocksource(clock);
+ cycle_now = clocksource_read(clock);
/* calculate the delta since the last update_wall_time: */
cycle_delta = (cycle_now - last_clock_cycle) & clock->mask;
@@ -845,7 +845,7 @@ static inline void __get_realtime_clock_ts(struct timespec *ts)
}
/**
- * get_realtime_clock_ts - Returns the time of day in a timespec
+ * getnstimeofday - Returns the time of day in a timespec
* @ts: pointer to the timespec to be set
*
* Returns the time of day in a timespec.
@@ -920,9 +920,9 @@ static int change_clocksource(void)
struct clocksource *new;
cycle_t now;
u64 nsec;
- new = get_next_clocksource();
+ new = clocksource_get_next();
if (clock != new) {
- now = read_clocksource(new);
+ now = clocksource_read(new);
nsec = __get_nsec_offset();
timespec_add_ns(&xtime, nsec);
@@ -966,9 +966,9 @@ void __init timekeeping_init(void)
unsigned long flags;
write_seqlock_irqsave(&xtime_lock, flags);
- clock = get_next_clocksource();
- calculate_clocksource_interval(clock, tick_nsec);
- last_clock_cycle = read_clocksource(clock);
+ clock = clocksource_get_next();
+ clocksource_calculate_interval(clock, tick_nsec);
+ last_clock_cycle = clocksource_read(clock);
ntp_clear();
write_sequnlock_irqrestore(&xtime_lock, flags);
}
@@ -988,7 +988,7 @@ static int timekeeping_resume(struct sys_device *dev)
write_seqlock_irqsave(&xtime_lock, flags);
/* restart the last cycle value */
- last_clock_cycle = read_clocksource(clock);
+ last_clock_cycle = clocksource_read(clock);
write_sequnlock_irqrestore(&xtime_lock, flags);
return 0;
}
@@ -1028,7 +1028,7 @@ static void update_wall_time(void)
snsecs_per_sec = (s64)NSEC_PER_SEC << clock->shift;
remainder_snsecs += (s64)xtime.tv_nsec << clock->shift;
- now = read_clocksource(clock);
+ now = clocksource_read(clock);
offset = (now - last_clock_cycle)&clock->mask;
/* normally this loop will run just once, however in the
@@ -1069,7 +1069,7 @@ static void update_wall_time(void)
if (change_clocksource()) {
error = 0;
remainder_snsecs = 0;
- calculate_clocksource_interval(clock, tick_nsec);
+ clocksource_calculate_interval(clock, tick_nsec);
}
}

Privacy Policy