Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core

Conflicts: kernel/time/timekeeping.c
2011-11-11 08:10:42 +01:00
parent c2bc11113c d65670a78c
commit 367177e501
3 changed files with 57 additions and 11 deletions
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -850,6 +850,13 @@ static void timekeeping_adjust(s64 offset)
 	} else /* No adjustment needed */
 		return;

+	WARN_ONCE(timekeeper.clock->maxadj &&
+			(timekeeper.mult + adj > timekeeper.clock->mult +
+						timekeeper.clock->maxadj),
+			"Adjusting %s more then 11%% (%ld vs %ld)\n",
+			timekeeper.clock->name, (long)timekeeper.mult + adj,
+			(long)timekeeper.clock->mult +
+				timekeeper.clock->maxadj);
 	/*
 	 * So the following can be confusing.
 	 *