timecompare: fix half-Y2K38 problem in timecompare_update while calculating offset

[net-next-2.6.git] / kernel / time / timecompare.c

diff --git a/kernel/time/timecompare.c b/kernel/time/timecompare.c
index 96ff643a5a59bdf1745e776434115cd430fa3935..12f5c55090bea159652c299d0db1a0a2969a3424 100644 (file)
--- a/kernel/time/timecompare.c
+++ b/kernel/time/timecompare.c
@@ -89,7 +89,7 @@ int timecompare_offset(struct timecompare *sync,
                         * source time
                         */
                        sample.offset =
-                               ktime_to_ns(ktime_add(end, start)) / 2 -
+                               (ktime_to_ns(end) + ktime_to_ns(start)) / 2 -
                                ts;
 
                        /* simple insertion sort based on duration */