diff --git a/[refs] b/[refs]
index 1ecfa1a99c0c..edc24042e588 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c972c2444dcb7088999c32b8c5a7ab3b8a6c0b6
+refs/heads/master: bbd1267690bb6940d0722dd33e929442c0409c01
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
index 1fa6615b317a..2b758c935c65 100644
--- a/trunk/kernel/time/ntp.c
+++ b/trunk/kernel/time/ntp.c
@@ -30,9 +30,9 @@ static u64			tick_length_base;
 
 static struct hrtimer		leap_timer;
 
-#define MAX_TICKADJ		500		/* usecs */
+#define MAX_TICKADJ		500LL		/* usecs */
 #define MAX_TICKADJ_SCALED \
-  (((u64)(MAX_TICKADJ * NSEC_PER_USEC) << NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ)
+	(((MAX_TICKADJ * NSEC_PER_USEC) << NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ)
 
 /*
  * phase-lock loop variables