update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / env / mem_callbacks / mem_callbacks.c

diff --git a/ceph/src/spdk/test/env/mem_callbacks/mem_callbacks.c b/ceph/src/spdk/test/env/mem_callbacks/mem_callbacks.c
index 42920dbcfe2c5d0724f06327434c4b453436c616..165ddb3d8e39402e9127c2f9ac5225ef96da4937 100644 (file)
--- a/ceph/src/spdk/test/env/mem_callbacks/mem_callbacks.c
+++ b/ceph/src/spdk/test/env/mem_callbacks/mem_callbacks.c
@@ -34,22 +34,14 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/util.h"
+#include "spdk/queue.h"
 #include "spdk_cunit.h"
 
 #include <rte_config.h>
 #include <rte_version.h>
 #include <rte_malloc.h>
 #include <rte_eal_memconfig.h>
-
-#if RTE_VERSION < RTE_VERSION_NUM(18, 05, 0, 0)
-
-static void
-test(void)
-{
-       printf("DPDK version %s does not support memory callbacks\n", rte_version());
-}
-
-#else
+#include <rte_eal.h>
 
 struct mem_allocation {
        uintptr_t                       vaddr;
@@ -181,8 +173,6 @@ test(void)
        rte_free(buf4);
 }
 
-#endif
-
 int
 main(int argc, char **argv)
 {