summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92d44a4 83d41fb 10573ae)
raw | combined (merge: 92d44a4 83d41fb 10573ae)
author | Russell King <rmk+kernel@armlinux.org.uk> | |
Tue, 5 Jun 2018 09:03:27 +0000 (10:03 +0100) | ||
committer | Russell 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 | patch | | diff1 | | diff2 | | diff3 | | blob | history |
arch/arm/include/asm/assembler.h | patch | | diff1 | | diff2 | | diff3 | | blob | history |
arch/arm/include/asm/kvm_asm.h | patch | | diff1 | | diff2 | | diff3 | | blob | history |
arch/arm/include/asm/kvm_host.h | patch | | diff1 | | diff2 | | diff3 | | blob | history |
arch/arm/include/asm/kvm_mmu.h | patch | | diff1 | | diff2 | | diff3 | | blob | history |
arch/arm/kernel/smp.c | patch | | diff1 | | diff2 | | diff3 | | blob | history |
arch/arm/mm/Makefile | patch | | diff1 | | diff2 | | diff3 | | blob | history |
arch/arm/mm/proc-v7.S | patch | | diff1 | | diff2 | | diff3 | | blob | history |
diff --cc arch/arm/boot/compressed/Makefile
Simple merge
diff --cc arch/arm/include/asm/assembler.h
Simple merge
diff --cc arch/arm/include/asm/kvm_asm.h
Simple merge
diff --cc arch/arm/include/asm/kvm_host.h
index c6a749568dd6c413603ef3b7554561f356b33cc9,c6a749568dd6c413603ef3b7554561f356b33cc9,11f91744ffb0fdedaa0488409f0aa7f9d4f5f958..8467e05360d7a3395d1a50b9b97c12f021e4ffc9
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__ */
diff --cc arch/arm/include/asm/kvm_mmu.h
Simple merge
diff --cc arch/arm/kernel/smp.c
Simple merge
diff --cc arch/arm/mm/Makefile
Simple merge
diff --cc arch/arm/mm/proc-v7.S
Simple merge