diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-01-29 12:00:00 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-01 16:11:12 +0800 |
| commit | b8df0120d69532cf0996f5887cd0b3118d028136 (patch) | |
| tree | 8f77739b996da7fc3320b0dc54a6d7c742ffea7f /arch/arm64/kernel/cpu-reset.S | |
| parent | 4bd9bee105ae32f26bdee0052f9cbc6af26fd6bc (diff) | |
arm64: idmap: Use "awx" flags for .idmap.text .pushsection directivesv4.9-meltdown
commit 439e70e27a51 upstream.
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>
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch/arm64/kernel/cpu-reset.S')
| -rw-r--r-- | arch/arm64/kernel/cpu-reset.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S index 65f42d257414..f736a6f81ecd 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 |