aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2010-10-14 07:59:04 -0400
committerAvi Kivity <avi@redhat.com>2010-10-24 04:53:15 -0400
commitd7a79b6c80fdbe4366484805ee07a4735fc427d8 (patch)
tree28b34eeebeffe4296f4ba136359321cd0c4007be /include
parent77db5cbd29b7cb0e0fb4fd146e7f7ac2831a025a (diff)
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>
Diffstat (limited to 'include')
-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,
483 struct kvm_assigned_dev_kernel *assigned_dev); 483 struct kvm_assigned_dev_kernel *assigned_dev);
484#else /* CONFIG_IOMMU_API */ 484#else /* CONFIG_IOMMU_API */
485static inline int kvm_iommu_map_pages(struct kvm *kvm, 485static inline int kvm_iommu_map_pages(struct kvm *kvm,
486 gfn_t base_gfn, 486 struct kvm_memory_slot *slot)
487 unsigned long npages)
488{ 487{
489 return 0; 488 return 0;
490} 489}