From aab1c53c862b95ae081ba03fc432b229b8854c8f Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 11 Mar 2010 14:04:47 -0800 Subject: [PATCH] --- yaml --- r: 192239 b: refs/heads/master c: 64ce4c2f5252f25798117fa80a027993163d6d84 h: refs/heads/master i: 192237: 228fec234376e952ee0060082a3cc15c37fa148c 192235: ebd584e88b5b5d9567a215a630c5fdb745d04f3c 192231: b06fd94f43ce22d0ddcbd6d210a90b3db1f51ad2 192223: ed75409e8aec66600ef077533817a613f295769c v: v3 --- [refs] | 2 +- trunk/kernel/time.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 90b8361bf04f..80924435becc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c28739375bf0d6e239b4fa939ec8372aa2c707d2 +refs/heads/master: 64ce4c2f5252f25798117fa80a027993163d6d84 diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c index 804798005d19..2358a3646a63 100644 --- a/trunk/kernel/time.c +++ b/trunk/kernel/time.c @@ -133,12 +133,11 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv, */ static inline void warp_clock(void) { - write_seqlock_irq(&xtime_lock); - wall_to_monotonic.tv_sec -= sys_tz.tz_minuteswest * 60; - xtime.tv_sec += sys_tz.tz_minuteswest * 60; - update_xtime_cache(0); - write_sequnlock_irq(&xtime_lock); - clock_was_set(); + struct timespec delta, adjust; + delta.tv_sec = sys_tz.tz_minuteswest * 60; + delta.tv_nsec = 0; + adjust = timespec_add_safe(current_kernel_time(), delta); + do_settimeofday(&adjust); } /*