Skip to content

Commit 8bb5b72

Browse files
Russell King (Oracle)gregkh
authored andcommitted
ARM: fix Thumb2 regression with Spectre BHB
commit 6c7cb60 upstream. 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 <nathan@kernel.org> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6b1249d commit 8bb5b72

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm/kernel/entry-armv.S

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

10441044
@ bhb workaround
10451045
mov r0, #8
1046-
1: b . + 4
1046+
3: b . + 4
10471047
subs r0, r0, #1
1048-
bne 1b
1048+
bne 3b
10491049
dsb
10501050
isb
10511051
b 2b

0 commit comments

Comments
 (0)