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/powerpc/kvm/powerpc.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/powerpc/kvm/powerpc.c')
-rw-r--r-- | arch/powerpc/kvm/powerpc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 934413cd3a1b..22b33159fbc4 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c | |||
@@ -411,18 +411,16 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages) | |||
411 | } | 411 | } |
412 | 412 | ||
413 | int kvm_arch_prepare_memory_region(struct kvm *kvm, | 413 | int kvm_arch_prepare_memory_region(struct kvm *kvm, |
414 | struct kvm_memory_slot *memslot, | 414 | struct kvm_memory_slot *memslot, |
415 | struct kvm_memory_slot old, | 415 | struct kvm_memory_slot old, |
416 | struct kvm_userspace_memory_region *mem, | 416 | struct kvm_userspace_memory_region *mem) |
417 | bool user_alloc) | ||
418 | { | 417 | { |
419 | return kvmppc_core_prepare_memory_region(kvm, memslot, mem); | 418 | return kvmppc_core_prepare_memory_region(kvm, memslot, mem); |
420 | } | 419 | } |
421 | 420 | ||
422 | void kvm_arch_commit_memory_region(struct kvm *kvm, | 421 | void kvm_arch_commit_memory_region(struct kvm *kvm, |
423 | struct kvm_userspace_memory_region *mem, | 422 | struct kvm_userspace_memory_region *mem, |
424 | struct kvm_memory_slot old, | 423 | struct kvm_memory_slot old) |
425 | bool user_alloc) | ||
426 | { | 424 | { |
427 | kvmppc_core_commit_memory_region(kvm, mem, old); | 425 | kvmppc_core_commit_memory_region(kvm, mem, old); |
428 | } | 426 | } |