aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Dykes <mardyk01@review.trustedfirmware.org>2020-04-03 21:41:05 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-04-03 21:41:05 +0000
commit083e123afaca7efb484086f947849d14aa381463 (patch)
treefc274204ac3b77057b78184ff43b01d338bfd491
parent6e2b866ac7dd46f5fa722b31124ba512702f8948 (diff)
parent3cde15fadea9cee8863c05e6908166166e5bca9b (diff)
downloadtrusted-firmware-a-083e123afaca7efb484086f947849d14aa381463.tar.gz
Merge "xlat_tables_v2: use get_current_el_maybe_constant() in is_dcache_enabled()" into integration
-rw-r--r--lib/xlat_tables_v2/aarch64/xlat_tables_arch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
index 8eeeea1dd5..3832b07034 100644
--- a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
+++ b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -135,7 +135,7 @@ bool is_mmu_enabled_ctx(const xlat_ctx_t *ctx)
bool is_dcache_enabled(void)
{
- unsigned int el = (unsigned int)GET_EL(read_CurrentEl());
+ unsigned int el = get_current_el_maybe_constant();
if (el == 1U) {
return (read_sctlr_el1() & SCTLR_C_BIT) != 0U;