Commit 667d1b48 authored Jun 15, 2012 by Will Deacon Committed by Russell King Jun 16, 2012

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>

parent 2bea29b7

arch/arm/include/asm/futex.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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"

arch/arm/kernel/entry-armv.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -495,6 +495,7 @@ ENDPROC(__und_usr)
		* The out of line fixup for the ldrt above.
		*/
		.pushsection .fixup, "ax"
		.align 2
		4: mov pc, r9
		.popsection
		.pushsection __ex_table,"a"