malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: arm64: fix a mismerge in proc.S

Browse Source 
Fix a mismerge in:
"FROMLIST: arm64: mm: avoid x18 in idmap_kpti_install_ng_mappings"

We should write x17 to sctlr_el1, not x18. We observed boot failures
because of this.

Before:
mrs     x17, sctlr_el1
bic     x17, x17, #SCTLR_ELx_M
msr     sctlr_el1, x18

After
mrs     x17, sctlr_el1
bic     x17, x17, #SCTLR_ELx_M
msr     sctlr_el1, x17

Signed-off-by: Miles Chen <miles.chen@mediatek.com>
Change-Id: Ib4356ec814beb374b7b57117e029241321f5fc22
This commit is contained in:
Miles Chen 2020-05-07 10:30:32 +08:00
parent 10557abb61
commit 01558dbf2e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/mm/proc.S
View File

@ -272,7 +272,7 @@ ENTRY(idmap_kpti_install_ng_mappings)
/* We need to walk swapper, so turn off the MMU. */
mrs x17, sctlr_el1
bic x17, x17, #SCTLR_ELx_M
msr sctlr_el1, x18
msr sctlr_el1, x17
isb
/* Everybody is enjoying the idmap, so we can rewrite swapper. */