[rtems commit] bsps/arm: do not introduce CPU_CACHE_LINE_BYTES in 4.11 and correct CPU_STRUCTURE_ALIGNMENT.

[Pavel Pisa]

Module:    rtems
Branch:    4.11
Commit:    58073284c6d33c3062abc529931021b1d47299af
Changeset: http://git.rtems.org/rtems/commit/?id=58073284c6d33c3062abc529931021b1d47299af

Author:    Pavel Pisa <pisa at cmp.felk.cvut.cz>
Date:      Mon Oct  3 11:54:41 2016 +0200

bsps/arm: do not introduce CPU_CACHE_LINE_BYTES in 4.11 and correct CPU_STRUCTURE_ALIGNMENT.

---

 cpukit/score/cpu/arm/rtems/score/cpu.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index 25d4ee2..69838c5 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -146,13 +146,11 @@
 #define CPU_STACK_GROWS_UP FALSE
 
 #if defined(ARM_MULTILIB_CACHE_LINE_MAX_64)
-  #define CPU_CACHE_LINE_BYTES 32
+  #define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned ( 64 )))
 #else
-  #define CPU_CACHE_LINE_BYTES 64
+  #define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned ( 32 )))
 #endif
 
-#define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned (CPU_CACHE_LINE_BYTES )))
-
 #define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC TRUE
 
 /*