summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2013-04-29 10:54:08 -0600
committerMarcelo Tosatti <mtosatti@redhat.com>2013-04-29 23:08:50 -0300
commit4cee4b72f1e2600e19779a14d4d9a4f4016ce49f (patch)
tree92663df9a836d5caa8281e21a888f27771eb1c9c /arch/ia64
parent5a2892ce72e010e3cb96b438d7cdddce0c88e0e6 (diff)
downloadlinux-3.10-4cee4b72f1e2600e19779a14d4d9a4f4016ce49f.tar.gz
linux-3.10-4cee4b72f1e2600e19779a14d4d9a4f4016ce49f.tar.bz2
linux-3.10-4cee4b72f1e2600e19779a14d4d9a4f4016ce49f.zip
kvm: KVM_CAP_IOMMU only available with device assignment
Fix build with CONFIG_PCI unset by linking KVM_CAP_IOMMU to device assignment config option. It has no purpose otherwise. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Reported-by: Randy Dunlap <rdunlap@infradead.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kvm/kvm-ia64.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index dcc560729c2..5b2dc0d10c8 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -204,9 +204,11 @@ int kvm_dev_ioctl_check_extension(long ext)
case KVM_CAP_COALESCED_MMIO:
r = KVM_COALESCED_MMIO_PAGE_OFFSET;
break;
+#ifdef CONFIG_KVM_DEVICE_ASSIGNMENT
case KVM_CAP_IOMMU:
r = iommu_present(&pci_bus_type);
break;
+#endif
default:
r = 0;
}