4.14-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Russell King <rmk+ker...@armlinux.org.uk>

Commit 3c908e16396d130608e831b7fac4b167a2ede6ba upstream.

Include Brahma B15 in the Spectre v2 KVM workarounds.

Signed-off-by: Russell King <rmk+ker...@armlinux.org.uk>
Acked-by: Florian Fainelli <f.faine...@gmail.com>
Boot-tested-by: Tony Lindgren <t...@atomide.com>
Reviewed-by: Tony Lindgren <t...@atomide.com>
Acked-by: Marc Zyngier <marc.zyng...@arm.com>
Signed-off-by: David A. Long <dave.l...@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 arch/arm/include/asm/kvm_mmu.h |    1 +
 1 file changed, 1 insertion(+)

--- a/arch/arm/include/asm/kvm_mmu.h
+++ b/arch/arm/include/asm/kvm_mmu.h
@@ -255,6 +255,7 @@ static inline void *kvm_get_hyp_vector(v
                return kvm_ksym_ref(__kvm_hyp_vector_bp_inv);
        }
 
+       case ARM_CPU_PART_BRAHMA_B15:
        case ARM_CPU_PART_CORTEX_A15:
        {
                extern char __kvm_hyp_vector_ic_inv[];


Reply via email to