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);
 }
 
 /*