Commit 667d1b48 authored by Will Deacon's avatar Will Deacon Committed by Russell King

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: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2bea29b7
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
" .long 1b, 4f, 2b, 4f\n" \ " .long 1b, 4f, 2b, 4f\n" \
" .popsection\n" \ " .popsection\n" \
" .pushsection .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \
"4: mov %0, " err_reg "\n" \ "4: mov %0, " err_reg "\n" \
" b 3b\n" \ " b 3b\n" \
" .popsection" " .popsection"
......
...@@ -495,6 +495,7 @@ ENDPROC(__und_usr) ...@@ -495,6 +495,7 @@ ENDPROC(__und_usr)
* The out of line fixup for the ldrt above. * The out of line fixup for the ldrt above.
*/ */
.pushsection .fixup, "ax" .pushsection .fixup, "ax"
.align 2
4: mov pc, r9 4: mov pc, r9
.popsection .popsection
.pushsection __ex_table,"a" .pushsection __ex_table,"a"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment