Commit 99b05644 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Two further fixes for Spectre-BHB from Ard for Cortex A15 and to use
  the wide branch instruction for Thumb2"

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2
  ARM: 9196/1: spectre-bhb: enable for Cortex-A15
parents 18e471dd 3cfb3019

arch/arm/kernel/entry-armv.S

+1 −1
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ vector_bhb_loop8_\name: 


	@ bhb workaround

	mov	r0, #8

3:	b	. + 4

3:	W(b)	. + 4

	subs	r0, r0, #1

	bne	3b

	dsb

arch/arm/mm/proc-v7-bugs.c

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ void cpu_v7_ca15_ibe(void) 
{

	if (check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(0)))

		cpu_v7_spectre_v2_init();

	cpu_v7_spectre_bhb_init();

}



void cpu_v7_bugs_init(void)