From 5eb03282803743f530c4f316699239985518d33f Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 22 Feb 2009 16:06:58 +0100
Subject: [PATCH] --- yaml --- r: 135758 b: refs/heads/master c:
 39854fe8c165872d743f6a0c4860ca2de8e45ac9 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/kernel/time/ntp.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5816fce90793..a0ccb86a7b33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 069569e025706f27f939785f86a94d5d8ce55dce
+refs/heads/master: 39854fe8c165872d743f6a0c4860ca2de8e45ac9
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
index a3fe7ef2d83b..c74eb7d9d854 100644
--- a/trunk/kernel/time/ntp.c
+++ b/trunk/kernel/time/ntp.c
@@ -236,7 +236,7 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer)
  */
 void second_overflow(void)
 {
-	s64 time_adj;
+	s64 delta;
 
 	/* Bump the maxerror field */
 	time_maxerror += MAXFREQ / NSEC_PER_USEC;
@@ -249,10 +249,11 @@ void second_overflow(void)
 	 * Compute the phase adjustment for the next second. The offset is
 	 * reduced by a fixed factor times the time constant.
 	 */
-	tick_length	= tick_length_base;
-	time_adj	= shift_right(time_offset, SHIFT_PLL + time_constant);
-	time_offset	-= time_adj;
-	tick_length	+= time_adj;
+	tick_length	 = tick_length_base;
+
+	delta		 = shift_right(time_offset, SHIFT_PLL + time_constant);
+	time_offset	-= delta;
+	tick_length	+= delta;
 
 	if (!time_adjust)
 		return;