Merge "aarch64/arm: Add compiler barrier to barrier instructions" into integration

fc860630 · André Przywara · TrustedFirmware Code Review · 6e97b224 · 2be491b1 · fc860630
Commit fc860630 authored 4 years ago by André Przywara Committed by TrustedFirmware Code Review 4 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/include/arch/aarch32/arch_helpers.h
+++ b/include/arch/aarch32/arch_helpers.h
@@ -166,7 +166,7 @@ static inline void _op(void)						\
 #define DEFINE_SYSOP_TYPE_FUNC(_op, _type)				\
 static inline void _op ## _type(void)					\
 {									\
-	__asm__ (#_op " " #_type);					\
+	__asm__ (#_op " " #_type : : : "memory");			\
 }

 /* Define function for system instruction with register parameter */

--- a/include/arch/aarch64/arch_helpers.h
+++ b/include/arch/aarch64/arch_helpers.h
@@ -80,7 +80,7 @@ static inline void _op(uint64_t v)			\
 #define DEFINE_SYSOP_TYPE_FUNC(_op, _type)		\
 static inline void _op ## _type(void)			\
 {							\
-	__asm__ (#_op " " #_type);			\
+	__asm__ (#_op " " #_type : : : "memory");			\
 }

 /* Define function for system instruction with register parameter */