From: Chen Gang Date: Wed, 21 May 2014 00:19:34 +0000 (+0800) Subject: net/dccp/timer.c: use 'u64' instead of 's64' to avoid compiler's warning X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5c4a43b024cce66bd65c45c338f1ec9fcbdf3a81;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: David S. Miller --- 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; */ 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); return delta;