revert "crc32: use __BYTE_ORDER macro for endian detection"

[safe/jmp/linux-2.6] / kernel / time / timecompare.c

diff --git a/kernel/time/timecompare.c b/kernel/time/timecompare.c
index 96ff643..ac38fbb 100644 (file)
--- a/kernel/time/timecompare.c
+++ b/kernel/time/timecompare.c
@@ -19,6 +19,7 @@
 
 #include <linux/timecompare.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/math64.h>
 
 /*
@@ -89,7 +90,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 */