Skip to content

GitLab

Commit ea12986b authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #1099 from douglas-raillard-arm/dr/fix_mm_copy 

xlat: fix mm copy when adding a region
parents 569c5374 73addb72
Hide whitespace changes
Inline Side-by-side
lib/xlat_tables_v2/xlat_tables_internal.c
View file @ ea12986b
...@@ -754,10 +754,7 @@ void mmap_add_region_ctx(xlat_ctx_t *ctx, const mmap_region_t *mm) ...@@ -754,10 +754,7 @@ void mmap_add_region_ctx(xlat_ctx_t *ctx, const mmap_region_t *mm)
*/ */
assert(mm_last->size == 0); assert(mm_last->size == 0);
mm_cursor->base_pa = mm->base_pa; *mm_cursor = *mm;
mm_cursor->base_va = mm->base_va;
mm_cursor->size = mm->size;
mm_cursor->attr = mm->attr;
if (end_pa > ctx->max_pa) if (end_pa > ctx->max_pa)
ctx->max_pa = end_pa; ctx->max_pa = end_pa;
...@@ -827,10 +824,8 @@ int mmap_add_dynamic_region_ctx(xlat_ctx_t *ctx, mmap_region_t *mm) ...@@ -827,10 +824,8 @@ int mmap_add_dynamic_region_ctx(xlat_ctx_t *ctx, mmap_region_t *mm)
*/ */
assert(mm_last->size == 0); assert(mm_last->size == 0);
mm_cursor->base_pa = mm->base_pa; *mm_cursor = *mm;
mm_cursor->base_va = mm->base_va; mm_cursor->attr |= MT_DYNAMIC;
mm_cursor->size = mm->size;
mm_cursor->attr = mm->attr | MT_DYNAMIC;
/* /*
* Update the translation tables if the xlat tables are initialized. If * Update the translation tables if the xlat tables are initialized. If
......
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