From 21c68943c4a26071de149ea3164f609b55f16003 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 15 Mar 2012 12:36:14 -0400 Subject: [PATCH] --- yaml --- r: 288804 b: refs/heads/master c: a078c6d0e6288fad6d83fb6d5edd91ddb7b6ab33 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/time/ntp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 205ddf54578c..92ed47db30cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f910381a55cdaa097030291f272f6e6e4380c39a +refs/heads/master: a078c6d0e6288fad6d83fb6d5edd91ddb7b6ab33 diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c index 17fb1b9807d0..6e039b144daf 100644 --- a/trunk/kernel/time/ntp.c +++ b/trunk/kernel/time/ntp.c @@ -289,7 +289,7 @@ static inline s64 ntp_update_offset_fll(s64 offset64, long secs) time_status |= STA_MODE; - return div_s64(offset64 << (NTP_SCALE_SHIFT - SHIFT_FLL), secs); + return div64_long(offset64 << (NTP_SCALE_SHIFT - SHIFT_FLL), secs); } static void ntp_update_offset(long offset)