diff options
author | john stultz <johnstul@us.ibm.com> | 2007-02-16 04:27:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:13:56 -0500 |
commit | f4304ab21513b834c8fe3403927c60c2b81a72d7 (patch) | |
tree | 212c8fa327d9cf3f29cccf172f0707a3eb6524f8 /kernel/timer.c | |
parent | 771ee3b04eaac6184312825eb600b4c598f027a5 (diff) |
[PATCH] HZ free ntp
Distangle the NTP update from HZ. This is necessary for dynamic tick enabled
kernels.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 4902181e10e6..4f9cc2a48beb 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -890,7 +890,7 @@ void __init timekeeping_init(void) | |||
890 | ntp_clear(); | 890 | ntp_clear(); |
891 | 891 | ||
892 | clock = clocksource_get_next(); | 892 | clock = clocksource_get_next(); |
893 | clocksource_calculate_interval(clock, tick_nsec); | 893 | clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH); |
894 | clock->cycle_last = clocksource_read(clock); | 894 | clock->cycle_last = clocksource_read(clock); |
895 | 895 | ||
896 | write_sequnlock_irqrestore(&xtime_lock, flags); | 896 | write_sequnlock_irqrestore(&xtime_lock, flags); |
@@ -1092,7 +1092,7 @@ static void update_wall_time(void) | |||
1092 | if (change_clocksource()) { | 1092 | if (change_clocksource()) { |
1093 | clock->error = 0; | 1093 | clock->error = 0; |
1094 | clock->xtime_nsec = 0; | 1094 | clock->xtime_nsec = 0; |
1095 | clocksource_calculate_interval(clock, tick_nsec); | 1095 | clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH); |
1096 | } | 1096 | } |
1097 | } | 1097 | } |
1098 | 1098 | ||