diff options
author | Anton Arapov <anton@redhat.com> | 2012-06-25 18:57:38 +0200 |
---|---|---|
committer | Anton Arapov <anton@redhat.com> | 2012-06-25 18:57:38 +0200 |
commit | 3d6fafb8cd68b287130dbd5b19fbb5e9bfa32a54 (patch) | |
tree | 72cb222e8096ba95c04460df4de752875b062a23 /kernel/time/ntp.c | |
parent | 35df99f47c4246df74ed7571c692138b83c3c486 (diff) | |
download | kernel-uprobes-3d6fafb8cd68b287130dbd5b19fbb5e9bfa32a54.tar.gz kernel-uprobes-3d6fafb8cd68b287130dbd5b19fbb5e9bfa32a54.tar.xz kernel-uprobes-3d6fafb8cd68b287130dbd5b19fbb5e9bfa32a54.zip |
fedora kernel: 6c6f1b8594284404f143c407081ebe65fe068c81v3.4.4-1
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'kernel/time/ntp.c')
-rw-r--r-- | kernel/time/ntp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index f03fd83b170..e8c867173ae 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -412,6 +412,7 @@ int second_overflow(unsigned long secs) if (secs % 86400 == 0) { leap = -1; time_state = TIME_OOP; + time_tai++; printk(KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n"); } @@ -426,7 +427,6 @@ int second_overflow(unsigned long secs) } break; case TIME_OOP: - time_tai++; time_state = TIME_WAIT; break; |