Messages in this thread Patch in this message | | | Date | Mon, 24 May 2010 11:54:23 +0200 (CEST) | From | Thomas Gleixner <> | Subject | [GIT Pull] timer fixes for 2.6.35-rc1 |
| |
Linus,
Please pull the latest timers-for-linus-urgent git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-for-linus-urgent
Thanks,
tglx
------------------> Thomas Gleixner (1): timekeeping: Fix timezone update
kernel/time.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/time.c b/kernel/time.c index 50612fa..848b1c2 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); }
| |