aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-09-30 23:28:25 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 00:39:26 -0700
commit8f807f8d2137ba728d22820103131038639b68a9 (patch)
treecea8d4eedbffc17ea9a01808afacb0e02dbbe206 /include/linux
parent3d3675cc3d04d7fd4bb11e8c1ea79e5ade4f5e44 (diff)
[PATCH] ntp: add time_adjust to tick length
This folds update_ntp_one_tick() into second_overflow() and adds time_adjust to the tick length, this makes time_next_adjust unnecessary. This slightly changes the adjtime() behaviour, instead of applying it to the next tick, it's applied to the next second. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Cc: john stultz <johnstul@us.ibm.com> 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.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 1cde6f6a271..b5f297e1766 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -217,7 +217,6 @@ extern long time_freq; /* frequency offset (scaled ppm) */
extern long time_reftime; /* time at last adjustment (s) */
extern long time_adjust; /* The amount of adjtime left */
-extern long time_next_adjust; /* Value for time_adjust at next tick */
extern void ntp_clear(void);
extern void ntp_update_frequency(void);