xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'kvm-tsx-ctrl' into HEAD

Browse Source 
Conflicts:
	arch/x86/kvm/vmx/vmx.c
This commit is contained in:
Paolo Bonzini
2019-11-21 10:01:51 +01:00
parent 14edff8831 b07a5c53d4
commit 46f4f0aabc
928 changed files with 13815 additions and 4785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kvm/lapic.c
View File

@@ -111,11 +111,6 @@ static inline int apic_enabled(struct kvm_lapic *apic)
(LVT_MASK | APIC_MODE_MASK | APIC_INPUT_POLARITY | \
APIC_LVT_REMOTE_IRR | APIC_LVT_LEVEL_TRIGGER)
static inline u8 kvm_xapic_id(struct kvm_lapic *apic)
{
return kvm_lapic_get_reg(apic, APIC_ID) >> 24;
}
static inline u32 kvm_x2apic_id(struct kvm_lapic *apic)
{
return apic->vcpu->vcpu_id;