]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branches 'fixes', 'misc' and 'spectre' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Tue, 5 Jun 2018 09:03:27 +0000 (10:03 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Tue, 5 Jun 2018 09:03:27 +0000 (10:03 +0100)
1  2  3 
arch/arm/boot/compressed/Makefile
arch/arm/include/asm/assembler.h
arch/arm/include/asm/kvm_asm.h
arch/arm/include/asm/kvm_host.h
arch/arm/include/asm/kvm_mmu.h
arch/arm/kernel/smp.c
arch/arm/mm/Makefile
arch/arm/mm/proc-v7.S

Simple merge
Simple merge
Simple merge
index c6a749568dd6c413603ef3b7554561f356b33cc9,c6a749568dd6c413603ef3b7554561f356b33cc9,11f91744ffb0fdedaa0488409f0aa7f9d4f5f958..8467e05360d7a3395d1a50b9b97c12f021e4ffc9
@@@@ -308,11 -308,11 -312,17 +309,20 @@@@ static inline void kvm_arm_vhe_guest_ex
   
   static inline bool kvm_arm_harden_branch_predictor(void)
   {
--      /* No way to detect it yet, pretend it is not there. */
--      return false;
++      switch(read_cpuid_part()) {
++ #ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
++      case ARM_CPU_PART_BRAHMA_B15:
++      case ARM_CPU_PART_CORTEX_A12:
++      case ARM_CPU_PART_CORTEX_A15:
++      case ARM_CPU_PART_CORTEX_A17:
++              return true;
++ #endif
++      default:
++              return false;
++      }
   }
   
  +static inline void kvm_vcpu_load_sysregs(struct kvm_vcpu *vcpu) {}
  +static inline void kvm_vcpu_put_sysregs(struct kvm_vcpu *vcpu) {}
  +
   #endif /* __ARM_KVM_HOST_H__ */
Simple merge
Simple merge
Simple merge
Simple merge