From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Thu, 4 Oct 2012 22:46:58 +0000 (-0700)
Subject: Revert "timekeeping: Fix leapsecond triggered load spike issue"
X-Git-Tag: v2.6.39-400.9.0~303^2~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=50006ba99bd507c715a5c61f1395a461c7c5878a;p=users%2Fjedix%2Flinux-maple.git

Revert "timekeeping: Fix leapsecond triggered load spike issue"

This reverts commit c87a0886e80457c30d110f517861cbc108ebbe01.

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

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 49975d598d3e..d9efcdd37bfd 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -836,8 +836,6 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
 		leap = second_overflow(xtime.tv_sec);
 		xtime.tv_sec += leap;
 		wall_to_monotonic.tv_sec -= leap;
-		if (leap)
-			clock_was_set_delayed();
 	}
 
 	/* Accumulate raw time */
@@ -949,8 +947,6 @@ static void update_wall_time(void)
 		leap = second_overflow(xtime.tv_sec);
 		xtime.tv_sec += leap;
 		wall_to_monotonic.tv_sec -= leap;
-		if (leap)
-			clock_was_set_delayed();
 	}
 
 	timekeeping_update(false);