lib: remove extra parenthesis after return

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

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index e6cb919..341fefb 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -85,7 +85,6 @@
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_per_lcore.h>
@@ -300,7 +299,7 @@ map_all_hugepages(struct hugepage_file *hugepg_tbl,
 #endif
 
        for (i = 0; i < hpi->num_pages[0]; i++) {
-               size_t hugepage_sz = hpi->hugepage_sz;
+               uint64_t hugepage_sz = hpi->hugepage_sz;
 
                if (orig) {
                        hugepg_tbl[i].file_id = i;
@@ -611,7 +610,7 @@ find_numasocket(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi)
        }
 
        snprintf(hugedir_str, sizeof(hugedir_str),
-                       "%s/", hpi->hugedir);
+                       "%s/%s", hpi->hugedir, internal_config.hugefile_prefix);
 
        /* parse numa map */
        while (fgets(buf, sizeof(buf), f) != NULL) {
@@ -881,7 +880,7 @@ get_socket_mem_size(int socket)
                        size += hpi->hugepage_sz * hpi->num_pages[socket];
        }
 
-       return (size);
+       return size;
 }
 
 /*
@@ -1189,7 +1188,9 @@ rte_eal_hugepage_init(void)
                int socket = tmp_hp[i].socket_id;
 
                /* find a hugepage info with right size and increment num_pages */
-               for (j = 0; j < (int) internal_config.num_hugepage_sizes; j++) {
+               const int nb_hpsizes = RTE_MIN(MAX_HUGEPAGE_SIZES,
+                               (int)internal_config.num_hugepage_sizes);
+               for (j = 0; j < nb_hpsizes; j++) {
                        if (tmp_hp[i].size ==
                                        internal_config.hugepage_info[j].hugepage_sz) {
 #ifdef RTE_EAL_SINGLE_FILE_SEGMENTS
@@ -1340,7 +1341,7 @@ rte_eal_hugepage_init(void)
                        "of memory.\n",
                        i, nr_hugefiles, RTE_STR(CONFIG_RTE_MAX_MEMSEG),
                        RTE_MAX_MEMSEG);
-               return (-ENOMEM);
+               return -ENOMEM;
        }
 
        return 0;