On Fri, Nov 07, 2014 at 09:28:09AM -0800, Jia Yu wrote: > Include rte_memory.h for lib files that use __rte_cache_aligned > attribute. > > Signed-off-by: Jia Yu <jyu at vmware.com> > Why? I presume there was a build break or something. Please repost with a changelog that details what this patch is for. Neil
> --- > lib/librte_distributor/rte_distributor.c | 1 + > lib/librte_eal/common/include/rte_malloc_heap.h | 1 + > lib/librte_ip_frag/rte_ip_frag.h | 1 + > lib/librte_malloc/malloc_elem.h | 2 ++ > lib/librte_mbuf/rte_mbuf.h | 1 + > lib/librte_port/rte_port_frag.c | 1 + > lib/librte_table/rte_table_acl.c | 1 + > lib/librte_table/rte_table_array.c | 1 + > lib/librte_table/rte_table_hash_ext.c | 1 + > lib/librte_table/rte_table_hash_key16.c | 1 + > lib/librte_table/rte_table_hash_key32.c | 1 + > lib/librte_table/rte_table_hash_key8.c | 1 + > lib/librte_table/rte_table_hash_lru.c | 1 + > lib/librte_table/rte_table_lpm.c | 1 + > lib/librte_table/rte_table_lpm_ipv6.c | 1 + > 15 files changed, 16 insertions(+) > > diff --git a/lib/librte_distributor/rte_distributor.c > b/lib/librte_distributor/rte_distributor.c > index 656ee5c..c3f7981 100644 > --- a/lib/librte_distributor/rte_distributor.c > +++ b/lib/librte_distributor/rte_distributor.c > @@ -35,6 +35,7 @@ > #include <sys/queue.h> > #include <string.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_memzone.h> > #include <rte_errno.h> > #include <rte_string_fns.h> > diff --git a/lib/librte_eal/common/include/rte_malloc_heap.h > b/lib/librte_eal/common/include/rte_malloc_heap.h > index f727b7a..716216f 100644 > --- a/lib/librte_eal/common/include/rte_malloc_heap.h > +++ b/lib/librte_eal/common/include/rte_malloc_heap.h > @@ -37,6 +37,7 @@ > #include <stddef.h> > #include <sys/queue.h> > #include <rte_spinlock.h> > +#include <rte_memory.h> > > /* Number of free lists per heap, grouped by size. */ > #define RTE_HEAP_NUM_FREELISTS 5 > diff --git a/lib/librte_ip_frag/rte_ip_frag.h > b/lib/librte_ip_frag/rte_ip_frag.h > index 230a903..3989a5a 100644 > --- a/lib/librte_ip_frag/rte_ip_frag.h > +++ b/lib/librte_ip_frag/rte_ip_frag.h > @@ -46,6 +46,7 @@ > > #include <rte_malloc.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_ip.h> > #include <rte_byteorder.h> > > diff --git a/lib/librte_malloc/malloc_elem.h b/lib/librte_malloc/malloc_elem.h > index 1d666a5..6e8c3e8 100644 > --- a/lib/librte_malloc/malloc_elem.h > +++ b/lib/librte_malloc/malloc_elem.h > @@ -34,6 +34,8 @@ > #ifndef MALLOC_ELEM_H_ > #define MALLOC_ELEM_H_ > > +#include <rte_memory.h> > + > /* dummy definition of struct so we can use pointers to it in malloc_elem > struct */ > struct malloc_heap; > > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index e8f9bfc..5998db0 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -54,6 +54,7 @@ > > #include <stdint.h> > #include <rte_mempool.h> > +#include <rte_memory.h> > #include <rte_atomic.h> > #include <rte_prefetch.h> > #include <rte_branch_prediction.h> > diff --git a/lib/librte_port/rte_port_frag.c b/lib/librte_port/rte_port_frag.c > index 9f1bd3c..048ae2e 100644 > --- a/lib/librte_port/rte_port_frag.c > +++ b/lib/librte_port/rte_port_frag.c > @@ -34,6 +34,7 @@ > > #include <rte_ether.h> > #include <rte_ip_frag.h> > +#include <rte_memory.h> > > #include "rte_port_frag.h" > > diff --git a/lib/librte_table/rte_table_acl.c > b/lib/librte_table/rte_table_acl.c > index c6d389e..1d88201 100644 > --- a/lib/librte_table/rte_table_acl.c > +++ b/lib/librte_table/rte_table_acl.c > @@ -36,6 +36,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_log.h> > > diff --git a/lib/librte_table/rte_table_array.c > b/lib/librte_table/rte_table_array.c > index f0f5e1e..bb1ed38 100644 > --- a/lib/librte_table/rte_table_array.c > +++ b/lib/librte_table/rte_table_array.c > @@ -36,6 +36,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_log.h> > > diff --git a/lib/librte_table/rte_table_hash_ext.c > b/lib/librte_table/rte_table_hash_ext.c > index 6e26d98..5096be5 100644 > --- a/lib/librte_table/rte_table_hash_ext.c > +++ b/lib/librte_table/rte_table_hash_ext.c > @@ -36,6 +36,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_log.h> > > diff --git a/lib/librte_table/rte_table_hash_key16.c > b/lib/librte_table/rte_table_hash_key16.c > index f5ec87d..6976317 100644 > --- a/lib/librte_table/rte_table_hash_key16.c > +++ b/lib/librte_table/rte_table_hash_key16.c > @@ -35,6 +35,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_log.h> > > diff --git a/lib/librte_table/rte_table_hash_key32.c > b/lib/librte_table/rte_table_hash_key32.c > index e8f4812..5ac91c0 100644 > --- a/lib/librte_table/rte_table_hash_key32.c > +++ b/lib/librte_table/rte_table_hash_key32.c > @@ -35,6 +35,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_log.h> > > diff --git a/lib/librte_table/rte_table_hash_key8.c > b/lib/librte_table/rte_table_hash_key8.c > index d60c96e..9216eaf 100644 > --- a/lib/librte_table/rte_table_hash_key8.c > +++ b/lib/librte_table/rte_table_hash_key8.c > @@ -35,6 +35,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_log.h> > > diff --git a/lib/librte_table/rte_table_hash_lru.c > b/lib/librte_table/rte_table_hash_lru.c > index d1a4984..9826957 100644 > --- a/lib/librte_table/rte_table_hash_lru.c > +++ b/lib/librte_table/rte_table_hash_lru.c > @@ -36,6 +36,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_log.h> > > diff --git a/lib/librte_table/rte_table_lpm.c > b/lib/librte_table/rte_table_lpm.c > index a175ff3..5e3e0f2 100644 > --- a/lib/librte_table/rte_table_lpm.c > +++ b/lib/librte_table/rte_table_lpm.c > @@ -36,6 +36,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_byteorder.h> > #include <rte_log.h> > diff --git a/lib/librte_table/rte_table_lpm_ipv6.c > b/lib/librte_table/rte_table_lpm_ipv6.c > index e3d59d0..62fdb33 100644 > --- a/lib/librte_table/rte_table_lpm_ipv6.c > +++ b/lib/librte_table/rte_table_lpm_ipv6.c > @@ -36,6 +36,7 @@ > > #include <rte_common.h> > #include <rte_mbuf.h> > +#include <rte_memory.h> > #include <rte_malloc.h> > #include <rte_byteorder.h> > #include <rte_log.h>
