net/hinic/base: fix clock definition with glibc version
authorXiaoyun Wang <cloud.wangxiaoyun@huawei.com>
Mon, 14 Sep 2020 14:31:46 +0000 (22:31 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 30 Sep 2020 17:19:09 +0000 (19:19 +0200)
Sync the repair of patch("fix compile error for old glibc
caused by CLOCK_MONOTONIC_RAW") in the community.

Fixes: efeed0894e9c ("net/hinic/base: avoid system time jump")
Cc: stable@dpdk.org
Signed-off-by: Xiaoyun Wang <cloud.wangxiaoyun@huawei.com>
drivers/net/hinic/base/hinic_compat.h

index 7036b03..6dd210e 100644 (file)
@@ -166,11 +166,17 @@ static inline u32 readl(const volatile void *addr)
 #define spin_lock(spinlock_prt)                rte_spinlock_lock(spinlock_prt)
 #define spin_unlock(spinlock_prt)      rte_spinlock_unlock(spinlock_prt)
 
+#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
+#define CLOCK_TYPE CLOCK_MONOTONIC_RAW
+#else
+#define CLOCK_TYPE CLOCK_MONOTONIC
+#endif
+
 static inline unsigned long clock_gettime_ms(void)
 {
        struct timespec tv;
 
-       (void)clock_gettime(CLOCK_MONOTONIC, &tv);
+       (void)clock_gettime(CLOCK_TYPE, &tv);
 
        return (unsigned long)tv.tv_sec * 1000 +
               (unsigned long)tv.tv_nsec / 1000000;