aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/futex.h
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-06-15 16:49:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-06-16 16:30:25 +0100
commit667d1b48bcb66b89776ebefbaf05b358bc5907ce (patch)
treeeee7dcb6957c8a685e78fa132fb805edffc8a271 /arch/arm/include/asm/futex.h
parent2bea29b774ccb4bf32c7b299c677fccc5a1d8443 (diff)
downloadlinux-linaro-stable-667d1b48bcb66b89776ebefbaf05b358bc5907ce.tar.gz
ARM: 7425/1: extable: ensure fixup entries are 4-byte aligned
Fixup entries in the kernel exception tables should be 4-byte aligned since we return directly to them when handling a faulting instruction in the kernel. This patch adds the missing align directives to the fixup entries. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/futex.h')
-rw-r--r--arch/arm/include/asm/futex.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
index 7be54690aeec..e42cf597f6e6 100644
--- a/arch/arm/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
@@ -19,6 +19,7 @@
" .long 1b, 4f, 2b, 4f\n" \
" .popsection\n" \
" .pushsection .fixup,\"ax\"\n" \
+ " .align 2\n" \
"4: mov %0, " err_reg "\n" \
" b 3b\n" \
" .popsection"