diff options
| author | Mohammed Khajapasha <mkhaja@codeaurora.org> | 2017-04-18 16:01:06 +0530 |
|---|---|---|
| committer | Mohammed Khajapasha <mkhaja@codeaurora.org> | 2017-04-19 11:33:07 +0530 |
| commit | a58123672c958f7d653d227a9cad4a31a9c5d925 (patch) | |
| tree | a3f06ebfc2a5c29644809dfe302c0583c23bbd3f /arch/arm64/kernel/head.S | |
| parent | 5ca5edbcb06ffeda450e16f6f70d1f6a0b168925 (diff) | |
Revert "arm64: Change cpu_resume() to enable mmu early ..."
This reverts commit 3b5f4eb5962e ("arm64: Change cpu_resume()
to enable mmu early then access sleep_sp by va"). This
change removed KASAN unpoison check from the original upstream
commit. Subsequent change in this series includes the original
change, with KASAN check present.
Change-Id: Ib8ec11078bef1eb167d69d922a66630aa6379e84
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index a1c2ac38771d..702bc2022b85 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -663,7 +663,7 @@ ENDPROC(__secondary_switched) * If it isn't, park the CPU */ .section ".idmap.text", "ax" -ENTRY(__enable_mmu) +__enable_mmu: mrs x22, sctlr_el1 // preserve old SCTLR_EL1 value mrs x1, ID_AA64MMFR0_EL1 ubfx x2, x1, #ID_AA64MMFR0_TGRAN_SHIFT, 4 |