From 01558dbf2e28c0999823be348910d1f14ff5917f Mon Sep 17 00:00:00 2001 From: Miles Chen Date: Thu, 7 May 2020 10:30:32 +0800 Subject: [PATCH] ANDROID: arm64: fix a mismerge in proc.S 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 Change-Id: Ib4356ec814beb374b7b57117e029241321f5fc22 --- arch/arm64/mm/proc.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 118597813da7..885ac66a9143 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -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. */