diff --git a/[refs] b/[refs] index 73f5670cad95..9af33dedf81a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdceb6a0162274934386f19f3ea5a9d44feb0b20 +refs/heads/master: 9acf6597c533f3d5c991f730c6a1be296679018e diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c index 96fd0f499631..d4335c1c884c 100644 --- a/trunk/kernel/time.c +++ b/trunk/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);