aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorjohn stultz <johnstul@us.ibm.com>2006-10-01 02:28:22 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:26 -0400
commit4c7ee8de956fc250fe31e2fa91f6da980fabe317 (patch)
treee2d7c207a7ca9f785c256513686f6d7f7234ef93 /include/linux
parentc902e0a0102f1095eec4b3511c13c84ca2bc4577 (diff)
[PATCH] NTP: Move all the NTP related code to ntp.c
Move all the NTP related code to ntp.c [akpm@osdl.org: cleanups, build fix] Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Ingo Molnar <mingo@elte.hu> 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 'include/linux')
-rw-r--r--include/linux/timex.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h
index d543d3871e38..2a21485bf183 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -294,11 +294,15 @@ extern void register_time_interpolator(struct time_interpolator *);
294extern void unregister_time_interpolator(struct time_interpolator *); 294extern void unregister_time_interpolator(struct time_interpolator *);
295extern void time_interpolator_reset(void); 295extern void time_interpolator_reset(void);
296extern unsigned long time_interpolator_get_offset(void); 296extern unsigned long time_interpolator_get_offset(void);
297extern void time_interpolator_update(long delta_nsec);
297 298
298#else /* !CONFIG_TIME_INTERPOLATION */ 299#else /* !CONFIG_TIME_INTERPOLATION */
299 300
300static inline void 301static inline void time_interpolator_reset(void)
301time_interpolator_reset(void) 302{
303}
304
305static inline void time_interpolator_update(long delta_nsec)
302{ 306{
303} 307}
304 308
@@ -309,6 +313,8 @@ time_interpolator_reset(void)
309/* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */ 313/* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */
310extern u64 current_tick_length(void); 314extern u64 current_tick_length(void);
311 315
316extern void second_overflow(void);
317extern void update_ntp_one_tick(void);
312extern int do_adjtimex(struct timex *); 318extern int do_adjtimex(struct timex *);
313 319
314#endif /* KERNEL */ 320#endif /* KERNEL */