From e014a71da7567651d180aa1c15822eda03f4e4e2 Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Fri, 13 Jul 2012 01:21:52 -0400
Subject: [PATCH] --- yaml --- r: 312387 b: refs/heads/master c:
 fee84c43e6afc42295ae8058cbbef9ea5633926c h: refs/heads/master i:   312385:
 b15060b158296f6a8a4ab7ad564c5f78c04ec4bb   312383:
 b3b0df5a619a4b971d072d9f5cc9137d7beb113d v: v3

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

diff --git a/[refs] b/[refs]
index 83a39a43ec74..3aee37e86bd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42e71e81f5bb5125ca7c194b5ccf1c93511ff8fb
+refs/heads/master: fee84c43e6afc42295ae8058cbbef9ea5633926c
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
index c2f12aa87fce..4fd83df0b14d 100644
--- a/trunk/kernel/time/timekeeping.c
+++ b/trunk/kernel/time/timekeeping.c
@@ -28,7 +28,7 @@ struct timekeeper {
 	/* NTP adjusted clock multiplier */
 	u32			mult;
 	/* The shift value of the current clocksource. */
-	int			shift;
+	u32			shift;
 	/* Number of clock cycles in one NTP interval. */
 	cycle_t			cycle_interval;
 	/* Number of clock shifted nano seconds in one NTP interval. */
@@ -45,7 +45,7 @@ struct timekeeper {
 	s64			ntp_error;
 	/* Shift conversion between clock shifted nano seconds and
 	 * ntp shifted nano seconds. */
-	int			ntp_error_shift;
+	u32			ntp_error_shift;
 
 	/* The current time */
 	struct timespec 	xtime;
@@ -960,7 +960,7 @@ static void timekeeping_adjust(s64 offset)
  *
  * Returns the unconsumed cycles.
  */
-static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
+static cycle_t logarithmic_accumulation(cycle_t offset, u32 shift)
 {
 	u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift;
 	u64 raw_nsecs;