eal: remove useless includes of mempool and ring

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

diff --git a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c
index 28ddf09..67b3caf 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c
+++ b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c
@@ -49,7 +49,6 @@
 #include <rte_string_fns.h>
 #include <rte_errno.h>
 #include <rte_ring.h>
-#include <rte_mempool.h>
 #include <rte_malloc.h>
 #include <rte_common.h>
 #include <rte_ivshmem.h>
@@ -254,17 +253,14 @@ adjacent(const struct rte_memzone * mz1, const struct rte_memzone * mz2)
 static int
 has_adjacent_segments(struct ivshmem_segment * ms, int len)
 {
-       int i, j, a;
+       int i, j;
 
        for (i = 0; i < len; i++)
                for (j = i + 1; j < len; j++) {
-                       a = adjacent(&ms[i].entry.mz, &ms[j].entry.mz);
-
-                       /* check if segments are adjacent virtually and/or physically but
-                        * not ioremap (since that would indicate that they are from
-                        * different PCI devices and thus don't need to be concatenated.
+                       /* we're only interested in fully adjacent segments; partially
+                        * adjacent segments can coexist.
                         */
-                       if ((a & (VIRT|PHYS)) > 0 && (a & IOREMAP) == 0)
+                       if (adjacent(&ms[i].entry.mz, &ms[j].entry.mz) == FULL)
                                return 1;
                }
        return 0;