[API-NEXT,PATCHv2,2/5] linux-generic: drv: fix align.h for new arch structure

Message ID 1469775446-28009-3-git-send-email-christophe.milard@linaro.org
State New
Headers show

Commit Message

Christophe Milard July 29, 2016, 6:57 a.m.
The arch directory structure has been changed. The linux-generic DRV
align.h file, which makes use of the cache line size defined in this
arch directory is updated here to match this new structure.

Signed-off-by: Christophe Milard <christophe.milard@linaro.org>

---
 platform/linux-generic/include/odp/drv/align.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

-- 
2.7.4

Patch

diff --git a/platform/linux-generic/include/odp/drv/align.h b/platform/linux-generic/include/odp/drv/align.h
index eded2e3..7636f89 100644
--- a/platform/linux-generic/include/odp/drv/align.h
+++ b/platform/linux-generic/include/odp/drv/align.h
@@ -17,6 +17,8 @@ 
 extern "C" {
 #endif
 
+#include <odp/api/cpu_arch.h>
+
 /** @ingroup odpdrv_compiler_optim
  *  @{
  */
@@ -31,16 +33,12 @@  extern "C" {
 
 #define ODPDRV_FIELD_SIZEOF(type, member) sizeof(((type *)0)->member)
 
-#if defined __arm__ || defined __aarch64__
-
-#define ODPDRV_CACHE_LINE_SIZE 64
-
-#endif
-
 #else
 #error Non-gcc compatible compiler
 #endif
 
+#define ODPDRV_CACHE_LINE_SIZE _ODP_CACHE_LINE_SIZE
+
 #define ODPDRV_PAGE_SIZE       4096
 
 #define ODPDRV_ALIGNED_CACHE   ODPDRV_ALIGNED(ODPDRV_CACHE_LINE_SIZE)