aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/time/timekeeping.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index c2f12aa87fce..4fd83df0b14d 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -28,7 +28,7 @@ struct timekeeper {
28 /* NTP adjusted clock multiplier */ 28 /* NTP adjusted clock multiplier */
29 u32 mult; 29 u32 mult;
30 /* The shift value of the current clocksource. */ 30 /* The shift value of the current clocksource. */
31 int shift; 31 u32 shift;
32 /* Number of clock cycles in one NTP interval. */ 32 /* Number of clock cycles in one NTP interval. */
33 cycle_t cycle_interval; 33 cycle_t cycle_interval;
34 /* Number of clock shifted nano seconds in one NTP interval. */ 34 /* Number of clock shifted nano seconds in one NTP interval. */
@@ -45,7 +45,7 @@ struct timekeeper {
45 s64 ntp_error; 45 s64 ntp_error;
46 /* Shift conversion between clock shifted nano seconds and 46 /* Shift conversion between clock shifted nano seconds and
47 * ntp shifted nano seconds. */ 47 * ntp shifted nano seconds. */
48 int ntp_error_shift; 48 u32 ntp_error_shift;
49 49
50 /* The current time */ 50 /* The current time */
51 struct timespec xtime; 51 struct timespec xtime;
@@ -960,7 +960,7 @@ static void timekeeping_adjust(s64 offset)
960 * 960 *
961 * Returns the unconsumed cycles. 961 * Returns the unconsumed cycles.
962 */ 962 */
963static cycle_t logarithmic_accumulation(cycle_t offset, int shift) 963static cycle_t logarithmic_accumulation(cycle_t offset, u32 shift)
964{ 964{
965 u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift; 965 u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift;
966 u64 raw_nsecs; 966 u64 raw_nsecs;