Skip to content

Commit 6c7cb60

Browse files
Russell King (Oracle)torvalds
authored andcommitted
ARM: fix Thumb2 regression with Spectre BHB
When building for Thumb2, the vectors make use of a local label. Sadly, the Spectre BHB code also uses a local label with the same number which results in the Thumb2 reference pointing at the wrong place. Fix this by changing the number used for the Spectre BHB local label. Fixes: b9baf5c ("ARM: Spectre-BHB workaround") Tested-by: Nathan Chancellor <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 3977a3f commit 6c7cb60

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/kernel/entry-armv.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,9 +1040,9 @@ vector_bhb_loop8_\name:
10401040

10411041
@ bhb workaround
10421042
mov r0, #8
1043-
1: b . + 4
1043+
3: b . + 4
10441044
subs r0, r0, #1
1045-
bne 1b
1045+
bne 3b
10461046
dsb
10471047
isb
10481048
b 2b

0 commit comments

Comments
 (0)