Merge branch 'kvm-tsx-ctrl' into HEAD

Conflicts: arch/x86/kvm/vmx/vmx.c
2019-11-21 10:01:51 +01:00
parent 14edff8831 b07a5c53d4
commit 46f4f0aabc
928 changed files with 13815 additions and 4785 deletions
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -245,4 +245,9 @@ static inline enum lapic_mode kvm_apic_mode(u64 apic_base)
 	return apic_base & (MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE);
 }

+static inline u8 kvm_xapic_id(struct kvm_lapic *apic)
+{
+	return kvm_lapic_get_reg(apic, APIC_ID) >> 24;
+}
+
 #endif