From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Thu, 14 Oct 2010 11:59:04 +0000 (+0200)
Subject: KVM: Fix signature of kvm_iommu_map_pages stub
X-Git-Tag: v2.6.37-rc1~142^2~1
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=d7a79b6c80fdbe4366484805ee07a4735fc427d8;p=net-next-2.6.git

KVM: Fix signature of kvm_iommu_map_pages stub

Breaks otherwise if CONFIG_IOMMU_API is not set.

KVM-Stable-Tag.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 0b89d008db6..866ed308436 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -483,8 +483,7 @@ int kvm_deassign_device(struct kvm *kvm,
 			struct kvm_assigned_dev_kernel *assigned_dev);
 #else /* CONFIG_IOMMU_API */
 static inline int kvm_iommu_map_pages(struct kvm *kvm,
-				      gfn_t base_gfn,
-				      unsigned long npages)
+				      struct kvm_memory_slot *slot)
 {
 	return 0;
 }