datapath: Fix build on RHEL 5.5

[openvswitch] / datapath / linux / compat / include / linux / jiffies.h

diff --git a/datapath/linux/compat/include/linux/jiffies.h b/datapath/linux/compat/include/linux/jiffies.h
index a64f22641eca0348ecb71e1279097b277db8c2c9..642eacec7c448e5ef29e026adec1cdd58784d789 100644 (file)
--- 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() */
+
+#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))
-#define time_before_eq64(a, b)   time_after_eq64(b, a)
+#endif
 
-#endif /* linux kernel < 2.6.19 */
+#ifndef time_before_eq64
+#define time_before_eq64(a, b)   time_after_eq64(b, a)
+#endif
 
 #endif