From b4eeb1ba75a5693eacb7671e0ab59a8f65bc74be Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Thu, 14 Oct 2010 13:59:04 +0200
Subject: [PATCH] --- yaml --- r: 215930 b: refs/heads/master c:
 d7a79b6c80fdbe4366484805ee07a4735fc427d8 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/kvm_host.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 45a7298a722a..38fd542f9785 100644
--- 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
index 0b89d008db65..866ed3084363 100644
--- 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;
 }