summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2013-07-31 10:36:26 +0200
committerThomas Monjalon <thomas.monjalon@6wind.com>2013-07-31 13:40:35 +0200
commite1d222e977af89bdc070260de5ef402b948771e1 (patch)
tree8f861df33ed223e19fed68de7c4306bb1957dce3
parent8521f1e1ae12dea0203555d1be723f7e5b6b1aba (diff)
downloaddpdk-e1d222e977af89bdc070260de5ef402b948771e1.zip
dpdk-e1d222e977af89bdc070260de5ef402b948771e1.tar.gz
dpdk-e1d222e977af89bdc070260de5ef402b948771e1.tar.xz
mem: fix include in rte_malloc
The function rte_malloc_virt2phy has a dependency on rte_memory.h: phys_addr_t must be defined. The dependency handling for apps was wrong in the commit 8c86825cbf. Let's revert this part. Reported-by: Jia Sui <jia.sui@advantech.com.cn> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com> Acked-by: Didier Pallard <didier.pallard@6wind.com>
-rw-r--r--app/test/test_hash.c2
-rw-r--r--app/test/test_hash_perf.c2
-rw-r--r--app/test/test_memcpy.c1
-rw-r--r--app/test/test_memcpy_perf.c1
-rw-r--r--lib/librte_malloc/rte_malloc.h1
5 files changed, 3 insertions, 4 deletions
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 4de8cb1..5437e05 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -41,10 +41,10 @@
#include <sys/queue.h>
#include <rte_common.h>
+#include <rte_malloc.h>
#include <rte_cycles.h>
#include <rte_random.h>
#include <rte_memory.h>
-#include <rte_malloc.h>
#include <rte_memzone.h>
#include <rte_tailq.h>
#include <rte_eal.h>
diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c
index 311c2bd..8a0feb3 100644
--- a/app/test/test_hash_perf.c
+++ b/app/test/test_hash_perf.c
@@ -42,10 +42,10 @@
#include <rte_common.h>
#include <rte_lcore.h>
+#include <rte_malloc.h>
#include <rte_cycles.h>
#include <rte_random.h>
#include <rte_memory.h>
-#include <rte_malloc.h>
#include <rte_memzone.h>
#include <rte_tailq.h>
#include <rte_eal.h>
diff --git a/app/test/test_memcpy.c b/app/test/test_memcpy.c
index 729a2ff..d7777a8 100644
--- a/app/test/test_memcpy.c
+++ b/app/test/test_memcpy.c
@@ -41,7 +41,6 @@
#include <cmdline_parse.h>
#include <rte_cycles.h>
#include <rte_random.h>
-#include <rte_memory.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
diff --git a/app/test/test_memcpy_perf.c b/app/test/test_memcpy_perf.c
index 1e75f53..236b295 100644
--- a/app/test/test_memcpy_perf.c
+++ b/app/test/test_memcpy_perf.c
@@ -41,7 +41,6 @@
#include <cmdline_parse.h>
#include <rte_cycles.h>
#include <rte_random.h>
-#include <rte_memory.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
diff --git a/lib/librte_malloc/rte_malloc.h b/lib/librte_malloc/rte_malloc.h
index e68187a..fe85689 100644
--- a/lib/librte_malloc/rte_malloc.h
+++ b/lib/librte_malloc/rte_malloc.h
@@ -42,6 +42,7 @@
*/
#include <stddef.h>
+#include <rte_memory.h>
#ifdef __cplusplus
extern "C" {