diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-09-27 09:46:59 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-09-27 09:46:59 +0000 |
| commit | 95982ffc98b8189209e307098f281c132715084a (patch) | |
| tree | a72dc50e0cadc37d5b0f7493e2b8be084e52e5d9 /lib | |
| parent | 17b0bb6cf53cd9cd904ac6551f3552bd884e8159 (diff) | |
| parent | 019b03a3001a61f7d42fa70abee6c284f542b2d2 (diff) | |
Merge "Fix MTE support from causing unused variable warnings" into integration
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/el3_runtime/aarch64/context_mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index a05ee5a6..d65e02d5 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -142,11 +142,11 @@ void cm_setup_context(cpu_context_t *ctx, const entry_point_info_t *ep) * world, and only for the secure world when CTX_INCLUDE_MTE_REGS is * set. */ - unsigned int mte = get_armv8_5_mte_support(); #if CTX_INCLUDE_MTE_REGS - assert(mte == MTE_IMPLEMENTED_ELX); + assert(get_armv8_5_mte_support() == MTE_IMPLEMENTED_ELX); scr_el3 |= SCR_ATA_BIT; #else + unsigned int mte = get_armv8_5_mte_support(); if (mte == MTE_IMPLEMENTED_EL0) { /* * Can enable MTE across both worlds as no MTE registers are |