aboutsummaryrefslogtreecommitdiff
path: root/core/kernel
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2018-03-09 17:13:25 +0100
committerJérôme Forissier <jerome.forissier@linaro.org>2018-04-03 18:07:07 +0200
commit211417d3a487e33e20ad3994837b313412b868a3 (patch)
treec1729c7296bdc8582038913c4a08fb893b654eef /core/kernel
parenta8d84b5836934ed78dfe931eed502317569ec931 (diff)
core: more flexible ta mapping
Replaces the current fixed array of TA map entries where some indexes have a special meaning. The new structures and functions dealing with this has a vm_ prefix instead of the old tee_mmu_ prefix. struct tee_ta_region is replaced by struct vm_region, which is now stored in a linked list using the new TEE_MATTR-bits to identify special regions. struct tee_mmu_info is replaced by vm_info, which now keeps the head of the linked list of regions. Acked-by: Etienne Carriere <etienne.carriere@linaro.org> Acked-by: Jerome Forissier <jerome.forissier@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'core/kernel')
-rw-r--r--core/kernel/tee_ta_manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/kernel/tee_ta_manager.c b/core/kernel/tee_ta_manager.c
index 010d7fc5..4a11d343 100644
--- a/core/kernel/tee_ta_manager.c
+++ b/core/kernel/tee_ta_manager.c
@@ -710,7 +710,7 @@ static void update_current_ctx(struct thread_specific_data *tsd)
* if ctx->mmu != NULL we must have user mapping active.
*/
if (((ctx && is_user_ta_ctx(ctx) ?
- to_user_ta_ctx(ctx)->mmu : NULL) == NULL) ==
+ to_user_ta_ctx(ctx)->vm_info : NULL) == NULL) ==
core_mmu_user_mapping_is_active())
panic("unexpected active mapping");
}