Commit 95982ffc authored by Soby Mathew's avatar Soby Mathew Committed by TrustedFirmware Code Review
Browse files

Merge "Fix MTE support from causing unused variable warnings" into integration

Showing with 2 additions and 2 deletions
+2 -2
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment