Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 1af9fb050fe2..671af612b768 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -187,8 +187,7 @@ static void change_clocksource(void)
 
         clock->error = 0;
         clock->xtime_nsec = 0;
-        clocksource_calculate_interval(clock,
-                (unsigned long)(current_tick_length()>>TICK_LENGTH_SHIFT));
+        clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH);
 
         tick_clock_notify();
 
@@ -245,8 +244,7 @@ void __init timekeeping_init(void)
         ntp_clear();
 
         clock = clocksource_get_next();
-        clocksource_calculate_interval(clock,
-                (unsigned long)(current_tick_length()>>TICK_LENGTH_SHIFT));
+        clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH);
         clock->cycle_last = clocksource_read(clock);
 
         xtime.tv_sec = sec;