summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/cpu-reset.S
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2018-01-29 13:00:00 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2018-02-06 23:53:27 +0100
commit439e70e27a51fe374806f460848066b237b0c10b (patch)
tree6ee39e0a49a2f6de0878fe09b291cf53fa9bd941 /arch/arm64/kernel/cpu-reset.S
parentarm64: assembler: Align phys_to_pte with pte_to_phys (diff)
downloadlinux-439e70e27a51fe374806f460848066b237b0c10b.tar.xz
linux-439e70e27a51fe374806f460848066b237b0c10b.zip
arm64: idmap: Use "awx" flags for .idmap.text .pushsection directives
The identity map is mapped as both writeable and executable by the SWAPPER_MM_MMUFLAGS and this is relied upon by the kpti code to manage a synchronisation flag. Update the .pushsection flags to reflect the actual mapping attributes. Reported-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/cpu-reset.S')
-rw-r--r--arch/arm64/kernel/cpu-reset.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S
index 2a752cb2a0f3..8021b46c9743 100644
--- a/arch/arm64/kernel/cpu-reset.S
+++ b/arch/arm64/kernel/cpu-reset.S
@@ -16,7 +16,7 @@
#include <asm/virt.h>
.text
-.pushsection .idmap.text, "ax"
+.pushsection .idmap.text, "awx"
/*
* __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for