diff options
author | Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp> | 2013-02-27 05:41:56 -0500 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2013-03-04 18:21:08 -0500 |
commit | 462fce46065ec4b200c08619c047b9e5a8fd154a (patch) | |
tree | c36cb39e0a8377da88b87ca5b99344357a6c31be /arch/arm/kvm/arm.c | |
parent | ee2c25efdd46d7ed5605d6fe877bdf4b47a4ab2e (diff) |
KVM: set_memory_region: Drop user_alloc from prepare/commit_memory_region()
X86 does not use this any more. The remaining user, s390's !user_alloc
check, can be simply removed since KVM_SET_MEMORY_REGION ioctl is no
longer supported.
Note: fixed powerpc's indentations with spaces to suppress checkpatch
errors.
Signed-off-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/arm/kvm/arm.c')
-rw-r--r-- | arch/arm/kvm/arm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 5a936988eb24..24cb5f66787d 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c | |||
@@ -231,16 +231,14 @@ int kvm_arch_set_memory_region(struct kvm *kvm, | |||
231 | int kvm_arch_prepare_memory_region(struct kvm *kvm, | 231 | 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 | bool user_alloc) | ||
236 | { | 235 | { |
237 | return 0; | 236 | return 0; |
238 | } | 237 | } |
239 | 238 | ||
240 | void kvm_arch_commit_memory_region(struct kvm *kvm, | 239 | void kvm_arch_commit_memory_region(struct kvm *kvm, |
241 | struct kvm_userspace_memory_region *mem, | 240 | struct kvm_userspace_memory_region *mem, |
242 | struct kvm_memory_slot old, | 241 | struct kvm_memory_slot old) |
243 | bool user_alloc) | ||
244 | { | 242 | { |
245 | } | 243 | } |
246 | 244 | ||