summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-22 12:11:11 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-25 18:38:08 +0100
commitbbd1267690bb6940d0722dd33e929442c0409c01 (patch)
tree5da24af0b2dae1b7a9cbd40cb19e087eee7065ab /kernel/time
parenttime: ntp: simplify the second_overflow() code flow (diff)
downloadlinux-bbd1267690bb6940d0722dd33e929442c0409c01.tar.xz
linux-bbd1267690bb6940d0722dd33e929442c0409c01.zip
time: ntp: simplify the MAX_TICKADJ_SCALED definition
Impact: cleanup, no functionality changed There's an ugly u64 typecase in the MAX_TICKADJ_SCALED definition, this can be eliminated by making the MAX_TICKADJ constant's type 64-bit (signed). kernel/time/ntp.o: text data bss dec hex filename 2504 114 136 2754 ac2 ntp.o.before 2504 114 136 2754 ac2 ntp.o.after md5: 41f3009debc9b397d7394dd77d912f0a ntp.o.before.asm 41f3009debc9b397d7394dd77d912f0a ntp.o.after.asm Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/ntp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 1fa6615b317a..2b758c935c65 100644
--- a/kernel/time/ntp.c
+++ b/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