aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fc2a0a132e4b..7d44204c6041 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2176,6 +2176,7 @@ int kvm_dev_ioctl_check_extension(long ext)
2176 case KVM_CAP_PCI_2_3: 2176 case KVM_CAP_PCI_2_3:
2177 case KVM_CAP_KVMCLOCK_CTRL: 2177 case KVM_CAP_KVMCLOCK_CTRL:
2178 case KVM_CAP_READONLY_MEM: 2178 case KVM_CAP_READONLY_MEM:
2179 case KVM_CAP_IRQFD_RESAMPLE:
2179 r = 1; 2180 r = 1;
2180 break; 2181 break;
2181 case KVM_CAP_COALESCED_MMIO: 2182 case KVM_CAP_COALESCED_MMIO:
@@ -6268,6 +6269,9 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
6268 6269
6269 /* Reserve bit 0 of irq_sources_bitmap for userspace irq source */ 6270 /* Reserve bit 0 of irq_sources_bitmap for userspace irq source */
6270 set_bit(KVM_USERSPACE_IRQ_SOURCE_ID, &kvm->arch.irq_sources_bitmap); 6271 set_bit(KVM_USERSPACE_IRQ_SOURCE_ID, &kvm->arch.irq_sources_bitmap);
6272 /* Reserve bit 1 of irq_sources_bitmap for irqfd-resampler */
6273 set_bit(KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID,
6274 &kvm->arch.irq_sources_bitmap);
6271 6275
6272 raw_spin_lock_init(&kvm->arch.tsc_write_lock); 6276 raw_spin_lock_init(&kvm->arch.tsc_write_lock);
6273 mutex_init(&kvm->arch.apic_map_lock); 6277 mutex_init(&kvm->arch.apic_map_lock);