Commit 1290c70d authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Russell King (Oracle)

ARM: 9200/1: spectre-bhb: avoid cross-subsection jump using a numbered label

In order to minimize potential confusion regarding numbered labels
appearing in a different order in the assembler output due to the use of
subsections, use a named local label to jump back into the vector
handler code from the associated loop8 mitigation sequence.
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent 892c608a
...@@ -1094,7 +1094,8 @@ vector_\name: ...@@ -1094,7 +1094,8 @@ vector_\name:
stmia sp, {r0, lr} @ save r0, lr stmia sp, {r0, lr} @ save r0, lr
@ Save spsr_<exception> (parent CPSR) @ Save spsr_<exception> (parent CPSR)
2: mrs lr, spsr .Lvec_\name:
mrs lr, spsr
str lr, [sp, #8] @ save spsr str lr, [sp, #8] @ save spsr
@ @
...@@ -1134,7 +1135,7 @@ vector_bhb_loop8_\name: ...@@ -1134,7 +1135,7 @@ vector_bhb_loop8_\name:
dsb nsh dsb nsh
@ isb not needed due to "movs pc, lr" in the vector stub @ isb not needed due to "movs pc, lr" in the vector stub
@ which gives a "context synchronisation". @ which gives a "context synchronisation".
b 2b b .Lvec_\name
ENDPROC(vector_bhb_loop8_\name) ENDPROC(vector_bhb_loop8_\name)
.previous .previous
#endif #endif
......
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