---

yaml --- r: 215930 b: refs/heads/master c: d7a79b6 h: refs/heads/master v: v3
git-mirror · Oct 24, 2010 · b4eeb1b · b4eeb1b
1 parent 54312a8
commit b4eeb1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77db5cbd29b7cb0e0fb4fd146e7f7ac2831a025a
+refs/heads/master: d7a79b6c80fdbe4366484805ee07a4735fc427d8
diff --git a/trunk/include/linux/kvm_host.h b/trunk/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;
 }