提交 5c4a43b0 编写于 作者: C Chen Gang 提交者: David S. Miller

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: NChen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 53819a6c
...@@ -280,7 +280,7 @@ static ktime_t dccp_timestamp_seed; ...@@ -280,7 +280,7 @@ static ktime_t dccp_timestamp_seed;
*/ */
u32 dccp_timestamp(void) u32 dccp_timestamp(void)
{ {
s64 delta = ktime_us_delta(ktime_get_real(), dccp_timestamp_seed); u64 delta = (u64)ktime_us_delta(ktime_get_real(), dccp_timestamp_seed);
do_div(delta, 10); do_div(delta, 10);
return delta; return delta;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册