Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
ea12986b
Commit
ea12986b
authored
Sep 19, 2017
by
davidcunado-arm
Committed by
GitHub
Sep 19, 2017
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
Changes
1
Show 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)
*/
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment