> -----Original Message----- > From: Phil Yang <[email protected]> > Sent: Friday, June 28, 2019 1:42 PM > To: [email protected] > Cc: [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; > [email protected]; [email protected]; > [email protected]; [email protected]; [email protected] > Subject: [EXT] [PATCH v3 3/3] eal/stack: enable lock-free stack for aarch64 > Enable both c11 atomic and non c11 atomic lock-free stack for aarch64. > > Signed-off-by: Phil Yang <[email protected]> > Reviewed-by: Honnappa Nagarahalli <[email protected]> > Tested-by: Honnappa Nagarahalli <[email protected]> > > Removed Items > ------------- > diff --git a/lib/librte_stack/rte_stack_lf_c11.h > b/lib/librte_stack/rte_stack_lf_c11.h > index 3d677ae..67c21fd 100644 > --- a/lib/librte_stack/rte_stack_lf_c11.h > +++ b/lib/librte_stack/rte_stack_lf_c11.h > @@ -36,7 +36,7 @@ __rte_stack_lf_push_elems(struct rte_stack_lf_list > *list, > struct rte_stack_lf_elem *last, > unsigned int num) > { > -#ifndef RTE_ARCH_X86_64 > +#if !defined(RTE_ARCH_X86_64) && !defined(RTE_ARCH_ARM64) > RTE_SET_USED(first); > RTE_SET_USED(last); > RTE_SET_USED(list); > @@ -88,7 +88,7 @@ __rte_stack_lf_pop_elems(struct rte_stack_lf_list *list, > void **obj_table, > struct rte_stack_lf_elem **last) > { > -#ifndef RTE_ARCH_X86_64 > +#if !defined(RTE_ARCH_X86_64) && !defined(RTE_ARCH_ARM64) > RTE_SET_USED(obj_table); > RTE_SET_USED(last); > RTE_SET_USED(list); > diff --git a/lib/librte_stack/rte_stack_lf_generic.h > b/lib/librte_stack/rte_stack_lf_generic.h > index 3182151..488fd9f 100644 > --- a/lib/librte_stack/rte_stack_lf_generic.h > +++ b/lib/librte_stack/rte_stack_lf_generic.h > @@ -36,7 +36,7 @@ __rte_stack_lf_push_elems(struct rte_stack_lf_list > *list, > struct rte_stack_lf_elem *last, > unsigned int num) > { > -#ifndef RTE_ARCH_X86_64 > +#if !defined(RTE_ARCH_X86_64) && !defined(RTE_ARCH_ARM64) > RTE_SET_USED(first); > RTE_SET_USED(last); > RTE_SET_USED(list); > @@ -84,7 +84,7 @@ __rte_stack_lf_pop_elems(struct rte_stack_lf_list *list, > void **obj_table, > struct rte_stack_lf_elem **last) > { > -#ifndef RTE_ARCH_X86_64 > +#if !defined(RTE_ARCH_X86_64) && !defined(RTE_ARCH_ARM64) > RTE_SET_USED(obj_table); > RTE_SET_USED(last); > RTE_SET_USED(list);
Can we remove this all #ifdef clutter by adding the following $ git diff diff --git a/lib/librte_stack/rte_stack_lf.h b/lib/librte_stack/rte_stack_lf.h index f5581f0c2..46af08b83 100644 --- a/lib/librte_stack/rte_stack_lf.h +++ b/lib/librte_stack/rte_stack_lf.h @@ -5,7 +5,7 @@ #ifndef _RTE_STACK_LF_H_ #define _RTE_STACK_LF_H_ -#ifdef RTE_USE_C11_MEM_MODEL +#if defined (RTE_USE_C11_MEM_MODEL) && defined(RTE_ARCH_X86_64) && defined(RTE_ARCH_ARM64) #include "rte_stack_lf_c11.h" #else #include "rte_stack_lf_generic.h"
