Merge "Replace deprecated __ASSEMBLY__ macro with __ASSEMBLER__" into integration

5 years ago · 942bb52e99
2 changed files with 4 additions and 4 deletions
--- 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 */