Merge "Replace deprecated __ASSEMBLY__ macro with __ASSEMBLER__" into integration

Merge "Replace deprecated ASSEMBLY macro with ASSEMBLER" into integration
942bb52e · Soby Mathew · TrustedFirmware Code Review · 879389ed · 89632e6a · 942bb52e
Commit 942bb52e authored 5 years ago by Soby Mathew Committed by TrustedFirmware Code Review 5 years ago
Show whitespace changes
Inline Side-by-side

Showing

with 4 additions and 4 deletions
+4 -4
--- a/include/lib/cpus/aarch64/cortex_a53.h
+++ b/include/lib/cpus/aarch64/cortex_a53.h
@@ -76,8 +76,8 @@
 /*******************************************************************************
 * Helper function to access a53_cpuectlr_el1 register on Cortex-A53 CPUs
 ******************************************************************************/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 DEFINE_RENAME_SYSREG_RW_FUNCS(a53_cpuectlr_el1, CORTEX_A53_ECTLR_EL1)
-#endif
+#endif /* __ASSEMBLER__ */

 #endif /* CORTEX_A53_H */
--- a/include/lib/cpus/aarch64/cortex_a73.h
+++ b/include/lib/cpus/aarch64/cortex_a73.h
@@ -38,8 +38,8 @@
 /*******************************************************************************
 * Helper function to access a73_cpuectlr_el1 register on Cortex-A73 CPUs
 ******************************************************************************/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 DEFINE_RENAME_SYSREG_RW_FUNCS(a73_cpuectlr_el1, CORTEX_A73_CPUECTLR_EL1)
-#endif
+#endif /* __ASSEMBLER__ */

 #endif /* CORTEX_A73_H */