diff options
| author |   Marc Zyngier <marc.zyngier@arm.com> | 2013-02-15 19:20:06 +0000 |
|---|---|---|
| committer |   Gleb Natapov <gleb@redhat.com> | 2013-02-25 11:47:28 +0200 |
| commit | bef103aa7dd75121f66848d91f6b6179d40c1a71 (patch) | |
| tree | 558330981a27a3d7a05c57ed82e74b0ac655ac70 /arch | |
| parent | Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 (diff) | |
| download | linux-dev-bef103aa7dd75121f66848d91f6b6179d40c1a71.tar.xz linux-dev-bef103aa7dd75121f66848d91f6b6179d40c1a71.zip | |
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>
Diffstat (limited to 'arch')
| -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, struct kvm_memory_slot *memslot, struct kvm_memory_slot old, struct kvm_userspace_memory_region *mem, - int user_alloc) + bool user_alloc) { return 0; } @@ -240,7 +240,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, void kvm_arch_commit_memory_region(struct kvm *kvm, struct kvm_userspace_memory_region *mem, struct kvm_memory_slot old, - int user_alloc) + bool user_alloc) { } |