enic: add device ids

[dpdk.git] / lib / librte_eal / common / eal_common_memzone.c

diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c
index f1fc4a7..888f9e5 100644 (file)
--- a/lib/librte_eal/common/eal_common_memzone.c
+++ b/lib/librte_eal/common/eal_common_memzone.c
@@ -43,7 +43,6 @@
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_per_lcore.h>
@@ -86,7 +85,7 @@ rte_memzone_reserve(const char *name, size_t len, int socket_id,
                      unsigned flags)
 {
        return rte_memzone_reserve_aligned(name,
-                       len, socket_id, flags, CACHE_LINE_SIZE);
+                       len, socket_id, flags, RTE_CACHE_LINE_SIZE);
 }
 
 /*
@@ -156,7 +155,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
        }
 
        /* if alignment is not a power of two */
-       if (!rte_is_power_of_2(align)) {
+       if (align && !rte_is_power_of_2(align)) {
                RTE_LOG(ERR, EAL, "%s(): Invalid alignment: %u\n", __func__,
                                align);
                rte_errno = EINVAL;
@@ -164,21 +163,21 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
        }
 
        /* alignment less than cache size is not allowed */
-       if (align < CACHE_LINE_SIZE)
-               align = CACHE_LINE_SIZE;
+       if (align < RTE_CACHE_LINE_SIZE)
+               align = RTE_CACHE_LINE_SIZE;
 
 
        /* align length on cache boundary. Check for overflow before doing so */
-       if (len > SIZE_MAX - CACHE_LINE_MASK) {
+       if (len > SIZE_MAX - RTE_CACHE_LINE_MASK) {
                rte_errno = EINVAL; /* requested size too big */
                return NULL;
        }
 
-       len += CACHE_LINE_MASK;
-       len &= ~((size_t) CACHE_LINE_MASK);
+       len += RTE_CACHE_LINE_MASK;
+       len &= ~((size_t) RTE_CACHE_LINE_MASK);
 
        /* save minimal requested  length */
-       requested_len = RTE_MAX((size_t)CACHE_LINE_SIZE,  len);
+       requested_len = RTE_MAX((size_t)RTE_CACHE_LINE_SIZE,  len);
 
        /* check that boundary condition is valid */
        if (bound != 0 &&
@@ -430,8 +429,8 @@ memseg_sanitize(struct rte_memseg *memseg)
        unsigned virt_align;
        unsigned off;
 
-       phys_align = memseg->phys_addr & CACHE_LINE_MASK;
-       virt_align = (unsigned long)memseg->addr & CACHE_LINE_MASK;
+       phys_align = memseg->phys_addr & RTE_CACHE_LINE_MASK;
+       virt_align = (unsigned long)memseg->addr & RTE_CACHE_LINE_MASK;
 
        /*
         * sanity check: phys_addr and addr must have the same
@@ -441,19 +440,19 @@ memseg_sanitize(struct rte_memseg *memseg)
                return -1;
 
        /* memseg is really too small, don't bother with it */
-       if (memseg->len < (2 * CACHE_LINE_SIZE)) {
+       if (memseg->len < (2 * RTE_CACHE_LINE_SIZE)) {
                memseg->len = 0;
                return 0;
        }
 
        /* align start address */
-       off = (CACHE_LINE_SIZE - phys_align) & CACHE_LINE_MASK;
+       off = (RTE_CACHE_LINE_SIZE - phys_align) & RTE_CACHE_LINE_MASK;
        memseg->phys_addr += off;
        memseg->addr = (char *)memseg->addr + off;
        memseg->len -= off;
 
        /* align end address */
-       memseg->len &= ~((uint64_t)CACHE_LINE_MASK);
+       memseg->len &= ~((uint64_t)RTE_CACHE_LINE_MASK);
 
        return 0;
 }