From: Hector Palacios Date: Mon, 14 Nov 2011 10:15:25 +0000 (+0100) Subject: timekeeping: add arch_offset hook to ktime_get functions X-Git-Tag: v2.6.34.14~52 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7806334afcaf4f0352a9c6f813264f5ef27d00f9;p=thirdparty%2Fkernel%2Fstable.git timekeeping: add arch_offset hook to ktime_get functions commit d004e024058a0eaca097513ce62cbcf978913e0a upstream. ktime_get and ktime_get_ts were calling timekeeping_get_ns() but later they were not calling arch_gettimeoffset() so architectures using this mechanism returned 0 ns when calling these functions. This happened for example when running Busybox's ping which calls syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts) which eventually calls ktime_get. As a result the returned ping travel time was zero. Signed-off-by: Hector Palacios Signed-off-by: John Stultz Signed-off-by: Paul Gortmaker --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 21cd75b3d8c8f..85599687d689d 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -277,6 +277,8 @@ ktime_t ktime_get(void) secs = xtime.tv_sec + wall_to_monotonic.tv_sec; nsecs = xtime.tv_nsec + wall_to_monotonic.tv_nsec; nsecs += timekeeping_get_ns(); + /* If arch requires, add in gettimeoffset() */ + nsecs += arch_gettimeoffset(); } while (read_seqretry(&xtime_lock, seq)); /* @@ -308,6 +310,8 @@ void ktime_get_ts(struct timespec *ts) *ts = xtime; tomono = wall_to_monotonic; nsecs = timekeeping_get_ns(); + /* If arch requires, add in gettimeoffset() */ + nsecs += arch_gettimeoffset(); } while (read_seqretry(&xtime_lock, seq));