linux-gen, include: drop interm _ODP_CACHE_LINE_SIZE define

_ODP_CACHE_LINE_SIZE is only used to define ODP_CACHE_LINE_SIZE. Drop
interim define and make cpu.h directly define ODP_CACHE_LINE_SIZE.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

11 files changed, 12 insertions, 12 deletions

diff --git a/include/odp/api/abi-default/align.h b/include/odp/api/abi-default/align.h
index 8521435b3..7a95078f8 100644
--- a/include/odp/api/abi-default/align.h
+++ b/include/odp/api/abi-default/align.h
@@ -37,7 +37,7 @@ extern "C" {
 #error Non-gcc compatible compiler
 #endif
 
-#define ODP_CACHE_LINE_SIZE _ODP_CACHE_LINE_SIZE
+/* ODP_CACHE_LINE_SIZE is defined in odp/api/abi/cpu.h */
 
 #define ODP_PAGE_SIZE       4096
 
diff --git a/include/odp/api/abi-default/cpu.h b/include/odp/api/abi-default/cpu.h
index fea13a484..af22dafdb 100644
--- a/include/odp/api/abi-default/cpu.h
+++ b/include/odp/api/abi-default/cpu.h
@@ -11,8 +11,8 @@
 extern "C" {
 #endif
 
-#ifndef _ODP_CACHE_LINE_SIZE
-#define _ODP_CACHE_LINE_SIZE 64
+#ifndef ODP_CACHE_LINE_SIZE
+#define ODP_CACHE_LINE_SIZE 64
 #endif
 
 #ifdef _ODP_NEED_GENERIC_CPU_PAUSE
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpu.h b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h
index 49546e256..1e483966e 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/cpu.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#define _ODP_CACHE_LINE_SIZE 64
+#define ODP_CACHE_LINE_SIZE 64
 
 static inline void odp_cpu_pause(void)
 {
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpu.h b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h
index 49546e256..1e483966e 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/cpu.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#define _ODP_CACHE_LINE_SIZE 64
+#define ODP_CACHE_LINE_SIZE 64
 
 static inline void odp_cpu_pause(void)
 {
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/cpu.h b/include/odp/arch/mips64-linux/odp/api/abi/cpu.h
index 9e1126ebf..589e9d038 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/cpu.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/cpu.h
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 #if defined __OCTEON__
-#define _ODP_CACHE_LINE_SIZE 128
+#define ODP_CACHE_LINE_SIZE 128
 #else
 #error Please add support for your arch in abi/cpu.h
 #endif
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h
index 3942bd327..a53144398 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#define _ODP_CACHE_LINE_SIZE 64
+#define ODP_CACHE_LINE_SIZE 64
 
 static inline void odp_cpu_pause(void)
 {
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h
index 2a5095859..a4695e608 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#define _ODP_CACHE_LINE_SIZE 64
+#define ODP_CACHE_LINE_SIZE 64
 
 static inline void odp_cpu_pause(void)
 {
diff --git a/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h
index 49546e256..1e483966e 100644
--- a/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h
+++ b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#define _ODP_CACHE_LINE_SIZE 64
+#define ODP_CACHE_LINE_SIZE 64
 
 static inline void odp_cpu_pause(void)
 {
diff --git a/platform/linux-generic/arch/arm/odp/api/abi/cpu.h b/platform/linux-generic/arch/arm/odp/api/abi/cpu.h
index 49546e256..1e483966e 100644
--- a/platform/linux-generic/arch/arm/odp/api/abi/cpu.h
+++ b/platform/linux-generic/arch/arm/odp/api/abi/cpu.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#define _ODP_CACHE_LINE_SIZE 64
+#define ODP_CACHE_LINE_SIZE 64
 
 static inline void odp_cpu_pause(void)
 {
diff --git a/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h b/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h
index 403f0eba2..7bf62d487 100644
--- a/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h
+++ b/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 #if defined __OCTEON__
-#define _ODP_CACHE_LINE_SIZE 128
+#define ODP_CACHE_LINE_SIZE 128
 #else
 #error Please add support for your arch in cpu_arch.h
 #endif
diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h
index 3942bd327..a53144398 100644
--- a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h
+++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#define _ODP_CACHE_LINE_SIZE 64
+#define ODP_CACHE_LINE_SIZE 64
 
 static inline void odp_cpu_pause(void)
 {