From 795fb0699dcff3a421be032f4762de1c75eaa6ca Mon Sep 17 00:00:00 2001 From: john stultz Date: Wed, 30 Jan 2008 13:30:03 +0100 Subject: [PATCH] --- yaml --- r: 79702 b: refs/heads/master c: bbe4d18ac2e058c56adb0cd71f49d9ed3216a405 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/time/timekeeping.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aad89d9c5dec..787ad0a4ba3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37a47db8d7f0f38dac5acf5a13abbc8f401707fa +refs/heads/master: bbe4d18ac2e058c56adb0cd71f49d9ed3216a405 diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index 77680195cf84..092a2366b5a9 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -186,7 +186,8 @@ static void change_clocksource(void) clock->error = 0; clock->xtime_nsec = 0; - clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH); + clocksource_calculate_interval(clock, + (unsigned long)(current_tick_length()>>TICK_LENGTH_SHIFT)); tick_clock_notify(); @@ -243,7 +244,8 @@ void __init timekeeping_init(void) ntp_clear(); clock = clocksource_get_next(); - clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH); + clocksource_calculate_interval(clock, + (unsigned long)(current_tick_length()>>TICK_LENGTH_SHIFT)); clock->cycle_last = clocksource_read(clock); xtime.tv_sec = sec;