Skip to content

Commit 3db249f

Browse files
committed
loader(aarch64 el1): pop stack properly
Need to pop the stack only once in el1_mmu_disable, and twice in el1_mmu_enable as we pushed once and twice respectively. Not sure how these got switched. Signed-off-by: Julia Vassiliki <julia.vassiliki@unsw.edu.au>
1 parent 110e293 commit 3db249f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

loader/src/aarch64/util64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ BEGIN_FUNC(el1_mmu_disable)
302302
*/
303303
bl invalidate_icache
304304

305-
ldp x27, x28, [sp], #16
306305
ldp x29, x30, [sp], #16
307306
ret
308307
END_FUNC(el1_mmu_disable)
@@ -372,6 +371,7 @@ BEGIN_FUNC(el1_mmu_enable)
372371

373372
enable_mmu sctlr_el1, x8
374373

374+
ldp x27, x28, [sp], #16
375375
ldp x29, x30, [sp], #16
376376
ret
377377

0 commit comments

Comments
 (0)