X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=kernel%2Ftime.c;h=848b1c2ab09a411858c8bef030ecdfc61b8017e8;hb=592fcb9dfafaa02dd0edc207bf5d3a0ee7a1f8df;hp=50612faa9baf268f95df39c5a518c3b9b4fce606;hpb=9d35bc1ec696ebfc5662a0d00b4d36564ff3af53;p=deliverable%2Flinux.git 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); }