diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2010-10-18 15:38:40 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-10-24 10:53:15 +0200 |
| commit | 2a31339aa014c0d0b97c57d3ebc997732f8f47fc (patch) | |
| tree | c758cfb01455966f7855701f6d16f2f8709bb247 | |
| parent | d7a79b6c80fdbe4366484805ee07a4735fc427d8 (diff) | |
| download | linux-stable-2a31339aa014c0d0b97c57d3ebc997732f8f47fc.tar.gz linux-stable-2a31339aa014c0d0b97c57d3ebc997732f8f47fc.tar.bz2 linux-stable-2a31339aa014c0d0b97c57d3ebc997732f8f47fc.zip | |
KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages
We also have to call kvm_iommu_map_pages for CONFIG_AMD_IOMMU. So drop
the dependency on Intel IOMMU, kvm_iommu_map_pages will be a nop anyway
if CONFIG_IOMMU_API is not defined.
KVM-Stable-Tag.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1aeeb7fbe2ef..ac326de43ce4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -705,14 +705,12 @@ skip_lpage: if (r) goto out_free; -#ifdef CONFIG_DMAR /* map the pages in iommu page table */ if (npages) { r = kvm_iommu_map_pages(kvm, &new); if (r) goto out_free; } -#endif r = -ENOMEM; slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL); |