diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-23 09:44:44 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-23 09:44:43 -0700 |
commit | 9e50ecf4cf70e77cbc2567cb1d454279aeb43878 (patch) | |
tree | 8452fab05929f37015e92ddb4158ccab2a623fa7 | |
parent | b23d994e0c8c2443df435b0b337ff4b9ad7e059b (diff) | |
parent | 9fcccba399ea0d840d0f6e60ff7efccef1d7a08e (diff) |
Merge "arm64: kaslr: use callee saved register to preserve SCTLR across C call"
-rw-r--r-- | arch/arm64/kernel/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 8cfd5ab37743..a1c2ac38771d 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -664,7 +664,7 @@ ENDPROC(__secondary_switched) */ .section ".idmap.text", "ax" ENTRY(__enable_mmu) - mrs x18, sctlr_el1 // preserve old SCTLR_EL1 value + mrs x22, sctlr_el1 // preserve old SCTLR_EL1 value mrs x1, ID_AA64MMFR0_EL1 ubfx x2, x1, #ID_AA64MMFR0_TGRAN_SHIFT, 4 cmp x2, #ID_AA64MMFR0_TGRAN_SUPPORTED @@ -691,7 +691,7 @@ ENTRY(__enable_mmu) * to take into account by discarding the current kernel mapping and * creating a new one. */ - msr sctlr_el1, x18 // disable the MMU + msr sctlr_el1, x22 // disable the MMU isb bl __create_page_tables // recreate kernel mapping |