Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers: Fix slack calculation for expired timers
  timekeeping: Fix timezone update

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/time.c b/kernel/time.c
index 50612faa9baf..848b1c2ab09a 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -132,10 +132,10 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,
  */
 static inline void warp_clock(void)
 {
-        struct timespec delta, adjust;
-        delta.tv_sec = sys_tz.tz_minuteswest * 60;
-        delta.tv_nsec = 0;
-        adjust = timespec_add_safe(current_kernel_time(), delta);
+        struct timespec adjust;
+
+        adjust = current_kernel_time();
+        adjust.tv_sec += sys_tz.tz_minuteswest * 60;
         do_settimeofday(&adjust);
 }