Imported Upstream version 16.07-rc1

[deb_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 07aec69..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>
@@ -184,21 +183,21 @@ overlap(const struct rte_memzone * mz1, const struct rte_memzone * mz2)
        i_end2 = mz2->ioremap_addr + mz2->len;
 
        /* check for overlap in virtual addresses */
-       if (start1 > start2 && start1 < end2)
+       if (start1 >= start2 && start1 < end2)
                result |= VIRT;
        if (start2 >= start1 && start2 < end1)
                result |= VIRT;
 
        /* check for overlap in physical addresses */
-       if (p_start1 > p_start2 && p_start1 < p_end2)
+       if (p_start1 >= p_start2 && p_start1 < p_end2)
                result |= PHYS;
-       if (p_start2 > p_start1 && p_start2 < p_end1)
+       if (p_start2 >= p_start1 && p_start2 < p_end1)
                result |= PHYS;
 
        /* check for overlap in ioremap addresses */
-       if (i_start1 > i_start2 && i_start1 < i_end2)
+       if (i_start1 >= i_start2 && i_start1 < i_end2)
                result |= IOREMAP;
-       if (i_start2 > i_start1 && i_start2 < i_end1)
+       if (i_start2 >= i_start1 && i_start2 < i_end1)
                result |= IOREMAP;
 
        return result;