summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-11-06 23:31:24 +0400
committerCatalin Marinas <catalin.marinas@arm.com>2013-12-19 21:43:07 +0400
commit4da7a56c59f28e27e8dcff61b5d7b05f6e203606 (patch)
tree575af2e3ddffa656f26daa7138083b5a0954a72c /arch/arm64
parent12a0ef7b0ac38677bd2d85f33df5ca0a57868819 (diff)
downloadlinux-4da7a56c59f28e27e8dcff61b5d7b05f6e203606.tar.xz
arm64: futex: ensure .fixup entries are sufficiently aligned
AArch64 instructions must be 4-byte aligned, so make sure this is true for the futex .fixup section. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/include/asm/futex.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h
index c582fa316366..78cc3aba5d69 100644
--- a/arch/arm64/include/asm/futex.h
+++ b/arch/arm64/include/asm/futex.h
@@ -30,6 +30,7 @@
" cbnz %w3, 1b\n" \
"3:\n" \
" .pushsection .fixup,\"ax\"\n" \
+" .align 2\n" \
"4: mov %w0, %w5\n" \
" b 3b\n" \
" .popsection\n" \