From: Christoph Lameter Date: Thu, 28 Apr 2005 15:13:58 +0000 (-0700) Subject: [PATCH] time interpolator: Fix settimeofday inaccuracy X-Git-Tag: firefly_0821_release~43454 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9acf6597c533f3d5c991f730c6a1be296679018e;p=firefly-linux-kernel-4.4.55.git [PATCH] time interpolator: Fix settimeofday inaccuracy settimeofday will set the time a little bit too early on systems using time interpolation since it subtracts the current interpolator offset from the time. This used to be necessary with the code in 2.6.9 and earlier but the new code resets the time interpolator after setting the time. Thus the time is set too early and gettimeofday will return a time slightly before the time specified with settimeofday if invoked immeditely after settimeofday. This removes the obsolete subtraction of the time interpolator offset and makes settimeofday set the time accurately. Signed-off-by: Christoph Lameter Signed-off-by: Linus Torvalds --- diff --git a/kernel/time.c b/kernel/time.c index 96fd0f499631..d4335c1c884c 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -516,14 +516,6 @@ int do_settimeofday (struct timespec *tv) write_seqlock_irq(&xtime_lock); { - /* - * This is revolting. We need to set "xtime" correctly. However, the value - * in this location is the value at the most recent update of wall time. - * Discover what correction gettimeofday would have done, and then undo - * it! - */ - nsec -= time_interpolator_get_offset(); - wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec); wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);