diff options
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/time.c b/kernel/time.c index 656dccfe1cbb..50612faa9baf 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
| @@ -132,12 +132,11 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv, | |||
| 132 | */ | 132 | */ |
| 133 | static inline void warp_clock(void) | 133 | static inline void warp_clock(void) |
| 134 | { | 134 | { |
| 135 | write_seqlock_irq(&xtime_lock); | 135 | struct timespec delta, adjust; |
| 136 | wall_to_monotonic.tv_sec -= sys_tz.tz_minuteswest * 60; | 136 | delta.tv_sec = sys_tz.tz_minuteswest * 60; |
| 137 | xtime.tv_sec += sys_tz.tz_minuteswest * 60; | 137 | delta.tv_nsec = 0; |
| 138 | update_xtime_cache(0); | 138 | adjust = timespec_add_safe(current_kernel_time(), delta); |
| 139 | write_sequnlock_irq(&xtime_lock); | 139 | do_settimeofday(&adjust); |
| 140 | clock_was_set(); | ||
| 141 | } | 140 | } |
| 142 | 141 | ||
| 143 | /* | 142 | /* |