aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2010-10-14 13:59:04 +0200
committerAvi Kivity <avi@redhat.com>2010-10-24 10:53:15 +0200
commitd7a79b6c80fdbe4366484805ee07a4735fc427d8 (patch)
tree28b34eeebeffe4296f4ba136359321cd0c4007be
parentKVM: MCE: Send SRAR SIGBUS directly (diff)
downloadlinux-dev-d7a79b6c80fdbe4366484805ee07a4735fc427d8.tar.xz
linux-dev-d7a79b6c80fdbe4366484805ee07a4735fc427d8.zip
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>
-rw-r--r--include/linux/kvm_host.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 0b89d008db65..866ed3084363 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;
}