Merge "Fix white space errors + remove #if defined" into integration

0efb83e1 · Sandrine Bailleux · TrustedFirmware Code Review · 63b96271 · 22cab650 · 0efb83e1
Commit 0efb83e1 authored 5 years ago by Sandrine Bailleux Committed by TrustedFirmware Code Review 5 years ago
Show whitespace changes
Inline Side-by-side

Showing

with 5 additions and 7 deletions
+5 -7
--- a/lib/cpus/aarch64/neoverse_n1.S
+++ b/lib/cpus/aarch64/neoverse_n1.S
@@ -21,9 +21,7 @@
 #error "Neoverse-N1 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
 #endif

-#if ERRATA_N1_IC_TRAP
 	.global neoverse_n1_errata_ic_trap_handler
-#endif

 /* --------------------------------------------------
 * Errata Workaround for Neoverse N1 Erratum 1043202.