Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / dccp / timer.c

diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 16f0b223102e6619b3b3430a108be740e2e7b373..1cd46a345cb04387a50843a251637b6e3cbd7501 100644 (file)
--- 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;