ARM: fix Thumb2 regression with Spectre BHB

0 Fork 0

mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-08 02:19:51 +01:00

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: b9baf5c8c5 ("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]>

This commit is contained in:

Russell King (Oracle) authored and

Linus Torvalds committed 2022-03-11 11:40:08 -08:00

1 parent 3977a3fb67

commit 6c7cb60bff

1 file changed

+2 -2

									
										arch/arm/kernel/entry-armv.S
									
		+2
		-2
	
												View File
												
				@@ -1040,9 +1040,9 @@ vector_bhb_loop8_\name:

					@ bhb workaround

					mov	r0, #8

				1:	b	. + 4

				3:	b	. + 4

					subs	r0, r0, #1

					bne	1b

					bne	3b

					dsb

					isb

					b	2b