From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Thu, 4 Oct 2012 22:46:59 +0000 (-0700)
Subject: Revert "ntp: Correct TAI offset during leap second"
X-Git-Tag: v2.6.39-400.9.0~303^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b4f283f8e0c2960267e22d224ef84e7bb745dd0d;p=users%2Fjedix%2Flinux-maple.git

Revert "ntp: Correct TAI offset during leap second"

This reverts commit c5f7406e214a073701f9d4aa44d5f920b2622f3b.

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 17accdaec0613..3d17ebd47fa25 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -412,7 +412,6 @@ 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");
 		}
@@ -427,6 +426,7 @@ int second_overflow(unsigned long secs)
 		}
 		break;
 	case TIME_OOP:
+		time_tai++;
 		time_state = TIME_WAIT;
 		break;