From ac01c7b81d10985d05fa25c57c39c35b628e188e Mon Sep 17 00:00:00 2001
From: John Stultz <johnstul@us.ibm.com>
Date: Thu, 18 Mar 2010 14:47:30 -0700
Subject: [PATCH] --- yaml --- r: 189096 b: refs/heads/master c:
 830ec0458c390f29c6c99e1ff7feab9e36368d12 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/time/timekeeping.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 935588b5094c..07220301ff85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15365c108ea27598e265f8c13e7051d99ca5b0b9
+refs/heads/master: 830ec0458c390f29c6c99e1ff7feab9e36368d12
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
index 16736379a9ca..39f6177fafac 100644
--- a/trunk/kernel/time/timekeeping.c
+++ b/trunk/kernel/time/timekeeping.c
@@ -818,7 +818,8 @@ void update_wall_time(void)
 	shift = min(shift, maxshift);
 	while (offset >= timekeeper.cycle_interval) {
 		offset = logarithmic_accumulation(offset, shift);
-		shift--;
+		if(offset < timekeeper.cycle_interval<<shift)
+			shift--;
 	}
 
 	/* correct the clock when NTP error is too big */