rib: add C++ include guard

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

diff --git a/lib/librte_eal/common/eal_common_memalloc.c b/lib/librte_eal/common/eal_common_memalloc.c
index 3005ef9..e872c65 100644 (file)
--- a/lib/librte_eal/common/eal_common_memalloc.c
+++ b/lib/librte_eal/common/eal_common_memalloc.c
@@ -9,7 +9,6 @@
 #include <rte_fbarray.h>
 #include <rte_memzone.h>
 #include <rte_memory.h>
-#include <rte_eal_memconfig.h>
 #include <rte_string_fns.h>
 #include <rte_rwlock.h>
 
@@ -75,13 +74,15 @@ eal_memalloc_is_contig(const struct rte_memseg_list *msl, void *start,
        void *end, *aligned_start, *aligned_end;
        size_t pgsz = (size_t)msl->page_sz;
        const struct rte_memseg *ms;
+       const struct internal_config *internal_conf =
+               eal_get_internal_configuration();
 
        /* for IOVA_VA, it's always contiguous */
-       if (rte_eal_iova_mode() == RTE_IOVA_VA)
+       if (rte_eal_iova_mode() == RTE_IOVA_VA && !msl->external)
                return true;
 
        /* for legacy memory, it's always contiguous */
-       if (internal_config.legacy_mem)
+       if (internal_conf->legacy_mem)
                return true;
 
        end = RTE_PTR_ADD(start, len);
@@ -243,7 +244,7 @@ eal_memalloc_mem_event_notify(enum rte_mem_event event, const void *start,
        rte_rwlock_read_lock(&mem_event_rwlock);
 
        TAILQ_FOREACH(entry, &mem_event_callback_list, next) {
-               RTE_LOG(DEBUG, EAL, "Calling mem event callback '%s:%p'",
+               RTE_LOG(DEBUG, EAL, "Calling mem event callback '%s:%p'\n",
                        entry->name, entry->arg);
                entry->clb(event, start, len, entry->arg);
        }