From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 29 Jan 2014 17:10:45 +0000 (+0100)
Subject: kvm: x86: move KVM_CAP_HYPERV_TIME outside #ifdef
X-Git-Tag: v3.14-rc3~17^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f66b62095d028b70a322df15e8f9ffcdbcb474c;p=kernel%2Fkernel-generic.git

kvm: x86: move KVM_CAP_HYPERV_TIME outside #ifdef

Self explanatory.

Reported-by: Radim Krcmar <rkrcmar@redhat.com>
Cc: Vadim Rozenfeld <vrozenfe@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 34d0d61..39c28f09 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2616,10 +2616,10 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_GET_TSC_KHZ:
 	case KVM_CAP_KVMCLOCK_CTRL:
 	case KVM_CAP_READONLY_MEM:
+	case KVM_CAP_HYPERV_TIME:
 #ifdef CONFIG_KVM_DEVICE_ASSIGNMENT
 	case KVM_CAP_ASSIGN_DEV_IRQ:
 	case KVM_CAP_PCI_2_3:
-	case KVM_CAP_HYPERV_TIME:
 #endif
 		r = 1;
 		break;