X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Flinux%2Fcompat%2Finclude%2Flinux%2Fjiffies.h;h=642eacec7c448e5ef29e026adec1cdd58784d789;hb=16d650e5a47cd0aa0430ab252330f0e66f3420c6;hp=3286e634679ba8d8955f3044c264e44d86fae992;hpb=22bcc0e70becd88bf895c44885d63704affe4284;p=openvswitch

diff --git a/datapath/linux/compat/include/linux/jiffies.h b/datapath/linux/compat/include/linux/jiffies.h
index 3286e634..642eacec 100644
--- a/datapath/linux/compat/include/linux/jiffies.h
+++ b/datapath/linux/compat/include/linux/jiffies.h
@@ -4,23 +4,31 @@
 #include_next <linux/jiffies.h>
 
 #include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 
 /* Same as above, but does so with platform independent 64bit types.
  * These must be used when utilizing jiffies_64 (i.e. return value of
  * get_jiffies_64() */
-#define time_after64(a,b)       \
-        (typecheck(__u64, a) && \
-         typecheck(__u64, b) && \
-         ((__s64)(b) - (__s64)(a) < 0))
-#define time_before64(a,b)      time_after64(b,a)
-
-#define time_after_eq64(a,b)    \
-        (typecheck(__u64, a) && \
-         typecheck(__u64, b) && \
-         ((__s64)(a) - (__s64)(b) >= 0))
-#define time_before_eq64(a,b)   time_after_eq64(b,a)
-
-#endif /* linux kernel < 2.6.19 */
+
+#ifndef time_after64
+#define time_after64(a, b)       \
+	(typecheck(__u64, a) && \
+	typecheck(__u64, b) && \
+	((__s64)(b) - (__s64)(a) < 0))
+#endif
+
+#ifndef time_before64
+#define time_before64(a, b)      time_after64(b, a)
+#endif
+
+#ifndef time_after_eq64
+#define time_after_eq64(a, b)    \
+	(typecheck(__u64, a) && \
+	typecheck(__u64, b) && \
+	((__s64)(a) - (__s64)(b) >= 0))
+#endif
+
+#ifndef time_before_eq64
+#define time_before_eq64(a, b)   time_after_eq64(b, a)
+#endif
 
 #endif