projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77db5cb
)
KVM: Fix signature of kvm_iommu_map_pages stub
author
Jan Kiszka
<jan.kiszka@siemens.com>
Thu, 14 Oct 2010 11:59:04 +0000
(13:59 +0200)
committer
Avi Kivity
<avi@redhat.com>
Sun, 24 Oct 2010 08:53:15 +0000
(10:53 +0200)
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>
include/linux/kvm_host.h
patch
|
blob
|
history
diff --git
a/include/linux/kvm_host.h
b/include/linux/kvm_host.h
index
0b89d00
..
866ed30
100644
(file)
--- 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;
}