diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-15 14:20:06 -0500 |
---|---|---|
committer | Gleb Natapov <gleb@redhat.com> | 2013-02-25 04:47:28 -0500 |
commit | bef103aa7dd75121f66848d91f6b6179d40c1a71 (patch) | |
tree | 558330981a27a3d7a05c57ed82e74b0ac655ac70 | |
parent | ab7826595e9ec51a51f622c5fc91e2f59440481a (diff) |
ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region
Commit f82a8cfe9 (KVM: struct kvm_memory_slot.user_alloc -> bool)
broke the ARM KVM port by changing the prototype of two global
functions.
Apply the same change to fix the compilation breakage.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
-rw-r--r-- | arch/arm/kvm/arm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 9ada5549216d..5a936988eb24 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c | |||
@@ -232,7 +232,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, | |||
232 | struct kvm_memory_slot *memslot, | 232 | struct kvm_memory_slot *memslot, |
233 | struct kvm_memory_slot old, | 233 | struct kvm_memory_slot old, |
234 | struct kvm_userspace_memory_region *mem, | 234 | struct kvm_userspace_memory_region *mem, |
235 | int user_alloc) | 235 | bool user_alloc) |
236 | { | 236 | { |
237 | return 0; | 237 | return 0; |
238 | } | 238 | } |
@@ -240,7 +240,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, | |||
240 | void kvm_arch_commit_memory_region(struct kvm *kvm, | 240 | void kvm_arch_commit_memory_region(struct kvm *kvm, |
241 | struct kvm_userspace_memory_region *mem, | 241 | struct kvm_userspace_memory_region *mem, |
242 | struct kvm_memory_slot old, | 242 | struct kvm_memory_slot old, |
243 | int user_alloc) | 243 | bool user_alloc) |
244 | { | 244 | { |
245 | } | 245 | } |
246 | 246 | ||