diff options
Diffstat (limited to 'kernel/time/ntp.c')
| -rw-r--r-- | kernel/time/ntp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 7fc64375ff43..4800f933910e 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
| @@ -194,8 +194,7 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer) | |||
| 194 | case TIME_OK: | 194 | case TIME_OK: |
| 195 | break; | 195 | break; |
| 196 | case TIME_INS: | 196 | case TIME_INS: |
| 197 | xtime.tv_sec--; | 197 | timekeeping_leap_insert(-1); |
| 198 | wall_to_monotonic.tv_sec++; | ||
| 199 | time_state = TIME_OOP; | 198 | time_state = TIME_OOP; |
| 200 | printk(KERN_NOTICE | 199 | printk(KERN_NOTICE |
| 201 | "Clock: inserting leap second 23:59:60 UTC\n"); | 200 | "Clock: inserting leap second 23:59:60 UTC\n"); |
| @@ -203,9 +202,8 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer) | |||
| 203 | res = HRTIMER_RESTART; | 202 | res = HRTIMER_RESTART; |
| 204 | break; | 203 | break; |
| 205 | case TIME_DEL: | 204 | case TIME_DEL: |
| 206 | xtime.tv_sec++; | 205 | timekeeping_leap_insert(1); |
| 207 | time_tai--; | 206 | time_tai--; |
| 208 | wall_to_monotonic.tv_sec--; | ||
| 209 | time_state = TIME_WAIT; | 207 | time_state = TIME_WAIT; |
| 210 | printk(KERN_NOTICE | 208 | printk(KERN_NOTICE |
| 211 | "Clock: deleting leap second 23:59:59 UTC\n"); | 209 | "Clock: deleting leap second 23:59:59 UTC\n"); |
| @@ -219,7 +217,6 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer) | |||
| 219 | time_state = TIME_OK; | 217 | time_state = TIME_OK; |
| 220 | break; | 218 | break; |
| 221 | } | 219 | } |
| 222 | update_vsyscall(&xtime, clock); | ||
| 223 | 220 | ||
| 224 | write_sequnlock(&xtime_lock); | 221 | write_sequnlock(&xtime_lock); |
| 225 | 222 | ||
