diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-09-19 18:30:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 18:30:15 +0100 |
| commit | ea12986b879b4b7faa4771d0a098e6b38f5ec6fe (patch) | |
| tree | a0c6ff4ac16a85317e75c4e1c7afbc04001d7acb /lib | |
| parent | 569c537483010ee91b04383128209ba95b99e395 (diff) | |
| parent | 73addb728d7f2f0e83d658fc0057c25671ad5aa8 (diff) | |
| download | platform_external_arm-trusted-firmware-ea12986b879b4b7faa4771d0a098e6b38f5ec6fe.tar.gz platform_external_arm-trusted-firmware-ea12986b879b4b7faa4771d0a098e6b38f5ec6fe.tar.bz2 platform_external_arm-trusted-firmware-ea12986b879b4b7faa4771d0a098e6b38f5ec6fe.zip | |
Merge pull request #1099 from douglas-raillard-arm/dr/fix_mm_copy
xlat: fix mm copy when adding a region
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/xlat_tables_v2/xlat_tables_internal.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/xlat_tables_v2/xlat_tables_internal.c b/lib/xlat_tables_v2/xlat_tables_internal.c index 8e1b00a71..479299067 100644 --- a/lib/xlat_tables_v2/xlat_tables_internal.c +++ b/lib/xlat_tables_v2/xlat_tables_internal.c @@ -754,10 +754,7 @@ void mmap_add_region_ctx(xlat_ctx_t *ctx, const mmap_region_t *mm) */ assert(mm_last->size == 0); - mm_cursor->base_pa = mm->base_pa; - mm_cursor->base_va = mm->base_va; - mm_cursor->size = mm->size; - mm_cursor->attr = mm->attr; + *mm_cursor = *mm; if (end_pa > ctx->max_pa) ctx->max_pa = end_pa; @@ -827,10 +824,8 @@ int mmap_add_dynamic_region_ctx(xlat_ctx_t *ctx, mmap_region_t *mm) */ assert(mm_last->size == 0); - mm_cursor->base_pa = mm->base_pa; - mm_cursor->base_va = mm->base_va; - mm_cursor->size = mm->size; - mm_cursor->attr = mm->attr | MT_DYNAMIC; + *mm_cursor = *mm; + mm_cursor->attr |= MT_DYNAMIC; /* * Update the translation tables if the xlat tables are initialized. If |