commit 942bb52e99f317579256b5d146b43221b1788fac
author Soby Mathew <soby.mathew@arm.com> Mon Oct 21 12:09:52 2019 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Mon Oct 21 12:09:52 2019 +0000
tree babe58b92600f291d9d1e1efffc7c216d5547b6f
parent 879389edd6c0a89854a9c222541c6caba92e7aaf
parent 89632e6aeba8414c1901eecb5d885363c73448f0

Merge "Replace deprecated __ASSEMBLY__ macro with __ASSEMBLER__" into integration

include/lib/cpus/aarch64/cortex_a53.h

diff --git a/include/lib/cpus/aarch64/cortex_a53.h b/include/lib/cpus/aarch64/cortex_a53.h
index ea7181e..6fe67a9 100644
--- 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 */

include/lib/cpus/aarch64/cortex_a73.h

diff --git a/include/lib/cpus/aarch64/cortex_a73.h b/include/lib/cpus/aarch64/cortex_a73.h
index fb4f1ec..271a333 100644
--- 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 */