summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>2015-07-15 17:32:20 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-07-16 13:44:48 +0200
commit2f9d47013e4dbb7381914e6e2e2470f69225cafc (patch)
tree5f71aca0470d504d939f40ae537de762b6fa57fc /config
parent58d3da9eddad28012c16523aa0b5f63dae791bcb (diff)
downloaddpdk-2f9d47013e4dbb7381914e6e2e2470f69225cafc.zip
dpdk-2f9d47013e4dbb7381914e6e2e2470f69225cafc.tar.gz
dpdk-2f9d47013e4dbb7381914e6e2e2470f69225cafc.tar.xz
mem: move librte_malloc to eal/common
Move malloc inside eal and create a new section in MAINTAINERS file for Memory Allocation in EAL. Create a dummy malloc library to avoid breaking applications that have librte_malloc in their DT_NEEDED entries. This is the first step towards using malloc to allocate memory directly from memsegs. Thus, memzones would allocate memory through malloc, allowing to free memzones. Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Diffstat (limited to 'config')
-rw-r--r--config/common_bsdapp9
-rw-r--r--config/common_linuxapp9
2 files changed, 4 insertions, 14 deletions
diff --git a/config/common_bsdapp b/config/common_bsdapp
index 7112f1c..5bb7f55 100644
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -106,6 +106,8 @@ CONFIG_RTE_LOG_LEVEL=8
CONFIG_RTE_LOG_HISTORY=256
CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=n
CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n
+CONFIG_RTE_MALLOC_DEBUG=n
+CONFIG_RTE_MALLOC_MEMZONE_SIZE=11M
#
# FreeBSD contiguous memory driver settings
@@ -308,13 +310,6 @@ CONFIG_RTE_LIBRTE_TIMER=y
CONFIG_RTE_LIBRTE_TIMER_DEBUG=n
#
-# Compile librte_malloc
-#
-CONFIG_RTE_LIBRTE_MALLOC=y
-CONFIG_RTE_LIBRTE_MALLOC_DEBUG=n
-CONFIG_RTE_MALLOC_MEMZONE_SIZE=11M
-
-#
# Compile librte_cfgfile
#
CONFIG_RTE_LIBRTE_CFGFILE=y
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 4d90d35..7b57044 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -109,6 +109,8 @@ CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=n
CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n
CONFIG_RTE_EAL_IGB_UIO=y
CONFIG_RTE_EAL_VFIO=y
+CONFIG_RTE_MALLOC_DEBUG=n
+CONFIG_RTE_MALLOC_MEMZONE_SIZE=11M
#
# Special configurations in PCI Config Space for high performance
@@ -316,13 +318,6 @@ CONFIG_RTE_LIBRTE_TIMER=y
CONFIG_RTE_LIBRTE_TIMER_DEBUG=n
#
-# Compile librte_malloc
-#
-CONFIG_RTE_LIBRTE_MALLOC=y
-CONFIG_RTE_LIBRTE_MALLOC_DEBUG=n
-CONFIG_RTE_MALLOC_MEMZONE_SIZE=11M
-
-#
# Compile librte_cfgfile
#
CONFIG_RTE_LIBRTE_CFGFILE=y