git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
virt
/
kvm
/
iommu.c
diff --git
a/virt/kvm/iommu.c
b/virt/kvm/iommu.c
index
967aba1
..
d5f3b8d
100644
(file)
--- a/
virt/kvm/iommu.c
+++ b/
virt/kvm/iommu.c
@@
-232,12
+232,12
@@
int kvm_iommu_map_guest(struct kvm *kvm)
{
int r;
{
int r;
- if (!iommu_
found(
)) {
+ if (!iommu_
present(&pci_bus_type
)) {
printk(KERN_ERR "%s: iommu not found\n", __func__);
return -ENODEV;
}
printk(KERN_ERR "%s: iommu not found\n", __func__);
return -ENODEV;
}
- kvm->arch.iommu_domain = iommu_domain_alloc();
+ kvm->arch.iommu_domain = iommu_domain_alloc(
&pci_bus_type
);
if (!kvm->arch.iommu_domain)
return -ENOMEM;
if (!kvm->arch.iommu_domain)
return -ENOMEM;