net/virtio: fix incorrect cast of void *

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_alarm.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_alarm.c b/lib/librte_eal/linuxapp/eal/eal_alarm.c
index ff57323..8e4a775 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_alarm.c
+++ b/lib/librte_eal/linuxapp/eal/eal_alarm.c
@@ -40,7 +40,6 @@
 #include <sys/timerfd.h>
 
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_common.h>
@@ -63,6 +62,12 @@
 #define MS_PER_S 1000
 #define US_PER_S (US_PER_MS * MS_PER_S)
 
+#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
+#else
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC
+#endif
+
 struct alarm_entry {
        LIST_ENTRY(alarm_entry) next;
        struct timeval time;
@@ -77,7 +82,7 @@ static rte_spinlock_t alarm_list_lk = RTE_SPINLOCK_INITIALIZER;
 
 static struct rte_intr_handle intr_handle = {.fd = -1 };
 static int handler_registered = 0;
-static void eal_alarm_callback(struct rte_intr_handle *hdl, void *arg);
+static void eal_alarm_callback(void *arg);
 
 int
 rte_eal_alarm_init(void)
@@ -96,15 +101,14 @@ error:
 }
 
 static void
-eal_alarm_callback(struct rte_intr_handle *hdl __rte_unused,
-               void *arg __rte_unused)
+eal_alarm_callback(void *arg __rte_unused)
 {
        struct timespec now;
        struct alarm_entry *ap;
 
        rte_spinlock_lock(&alarm_list_lk);
        while ((ap = LIST_FIRST(&alarm_list)) !=NULL &&
-                       clock_gettime(CLOCK_MONOTONIC_RAW, &now) == 0 &&
+                       clock_gettime(CLOCK_TYPE_ID, &now) == 0 &&
                        (ap->time.tv_sec < now.tv_sec || (ap->time.tv_sec == now.tv_sec &&
                                                (ap->time.tv_usec * NS_PER_US) <= now.tv_nsec))) {
                ap->executing = 1;
@@ -152,7 +156,7 @@ rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg)
                return -ENOMEM;
 
        /* use current time to calculate absolute time of alarm */
-       clock_gettime(CLOCK_MONOTONIC_RAW, &now);
+       clock_gettime(CLOCK_TYPE_ID, &now);
 
        new_alarm->cb_fn = cb_fn;
        new_alarm->cb_arg = cb_arg;