diff options
author | Chen Gang <gang.chen.5i5j@gmail.com> | 2014-05-20 20:19:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-22 15:31:45 -0400 |
commit | 5c4a43b024cce66bd65c45c338f1ec9fcbdf3a81 (patch) | |
tree | 7b9e6175884b26f65f2560266f7d79c02f45eefb /net/dccp | |
parent | 53819a6ced288a9abd3c0d36895bd0d006edf093 (diff) |
net/dccp/timer.c: use 'u64' instead of 's64' to avoid compiler's warning
'dccp_timestamp_seed' is initialized once by ktime_get_real() in
dccp_timestamping_init(). It is always less than ktime_get_real()
in dccp_timestamp().
Then, ktime_us_delta() in dccp_timestamp() will always return positive
number. So can use manual type cast to let compiler and do_div() know
about it to avoid warning.
The related warning (with allmodconfig under unicore32):
CC [M] net/dccp/timer.o
net/dccp/timer.c: In function ‘dccp_timestamp’:
net/dccp/timer.c:285: warning: comparison of distinct pointer types lacks a cast
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 16f0b223102e..1cd46a345cb0 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
@@ -280,7 +280,7 @@ static ktime_t dccp_timestamp_seed; | |||
280 | */ | 280 | */ |
281 | u32 dccp_timestamp(void) | 281 | u32 dccp_timestamp(void) |
282 | { | 282 | { |
283 | s64 delta = ktime_us_delta(ktime_get_real(), dccp_timestamp_seed); | 283 | u64 delta = (u64)ktime_us_delta(ktime_get_real(), dccp_timestamp_seed); |
284 | 284 | ||
285 | do_div(delta, 10); | 285 | do_div(delta, 10); |
286 | return delta; | 286 | return delta; |