summaryrefslogtreecommitdiffstats
path: root/arch/arm64/mm/proc.S
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2023-01-11 11:22:32 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2023-01-24 11:51:07 +0000
commitaf7249b317e4d0b3d5a0ebbb7ee7a0f336ca7bca (patch)
treeaedec4e0642fae38501d3460958486e41166221a /arch/arm64/mm/proc.S
parent82e4958800c01daa7662362ee9543065bd14c852 (diff)
downloadlinux-stable-af7249b317e4d0b3d5a0ebbb7ee7a0f336ca7bca.tar.gz
linux-stable-af7249b317e4d0b3d5a0ebbb7ee7a0f336ca7bca.tar.bz2
linux-stable-af7249b317e4d0b3d5a0ebbb7ee7a0f336ca7bca.zip
arm64: kernel: move identity map out of .text mapping
Reorganize the ID map slightly so that only code that is executed with the MMU off or via the 1:1 mapping remains. This allows us to move the identity map out of the .text segment, as it will no longer need executable permissions via the kernel mapping. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Link: https://lore.kernel.org/r/20230111102236.1430401-3-ardb@kernel.org Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/mm/proc.S')
-rw-r--r--arch/arm64/mm/proc.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 066fa60b93d2..91410f488090 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -110,7 +110,6 @@ SYM_FUNC_END(cpu_do_suspend)
*
* x0: Address of context pointer
*/
- .pushsection ".idmap.text", "awx"
SYM_FUNC_START(cpu_do_resume)
ldp x2, x3, [x0]
ldp x4, x5, [x0, #16]
@@ -166,7 +165,6 @@ alternative_else_nop_endif
isb
ret
SYM_FUNC_END(cpu_do_resume)
- .popsection
#endif
.pushsection ".idmap.text", "awx"