summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorRadim Krčmář <rkrcmar@redhat.com>2015-01-08 15:59:30 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-01-09 10:23:54 +0100
commitdefcf51fa93929bd5d3ce5b91f8e6a106dae5e46 (patch)
treee62b74ed23ed1b16326b30f71034c8cd8ce0da98 /arch/x86/kvm/x86.c
parentbab5bb398273bb37547a185f7b344b37c700d0b9 (diff)
downloadlinux-defcf51fa93929bd5d3ce5b91f8e6a106dae5e46.tar.gz
linux-defcf51fa93929bd5d3ce5b91f8e6a106dae5e46.tar.bz2
linux-defcf51fa93929bd5d3ce5b91f8e6a106dae5e46.zip
KVM: x86: allow TSC deadline timer on all hosts
Emulation does not utilize the feature. Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 49ecda7ca958..98930c64b06e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2752,6 +2752,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
case KVM_CAP_READONLY_MEM:
case KVM_CAP_HYPERV_TIME:
case KVM_CAP_IOAPIC_POLARITY_IGNORED:
+ case KVM_CAP_TSC_DEADLINE_TIMER:
#ifdef CONFIG_KVM_DEVICE_ASSIGNMENT
case KVM_CAP_ASSIGN_DEV_IRQ:
case KVM_CAP_PCI_2_3:
@@ -2790,9 +2791,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
case KVM_CAP_TSC_CONTROL:
r = kvm_has_tsc_control;
break;
- case KVM_CAP_TSC_DEADLINE_TIMER:
- r = boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER);
- break;
default:
r = 0;
break;