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/x86 | |
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/x86')
-rw-r--r-- | arch/x86/kvm/x86.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 811c5c9c8880..26216bb4403f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -6907,8 +6907,7 @@ out_free: | |||
6907 | int kvm_arch_prepare_memory_region(struct kvm *kvm, | 6907 | int kvm_arch_prepare_memory_region(struct kvm *kvm, |
6908 | struct kvm_memory_slot *memslot, | 6908 | struct kvm_memory_slot *memslot, |
6909 | struct kvm_memory_slot old, | 6909 | struct kvm_memory_slot old, |
6910 | struct kvm_userspace_memory_region *mem, | 6910 | struct kvm_userspace_memory_region *mem) |
6911 | bool user_alloc) | ||
6912 | { | 6911 | { |
6913 | int npages = memslot->npages; | 6912 | int npages = memslot->npages; |
6914 | 6913 | ||
@@ -6938,8 +6937,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, | |||
6938 | 6937 | ||
6939 | void kvm_arch_commit_memory_region(struct kvm *kvm, | 6938 | void kvm_arch_commit_memory_region(struct kvm *kvm, |
6940 | struct kvm_userspace_memory_region *mem, | 6939 | struct kvm_userspace_memory_region *mem, |
6941 | struct kvm_memory_slot old, | 6940 | struct kvm_memory_slot old) |
6942 | bool user_alloc) | ||
6943 | { | 6941 | { |
6944 | 6942 | ||
6945 | int nr_mmu_pages = 0, npages = mem->memory_size >> PAGE_SHIFT; | 6943 | int nr_mmu_pages = 0, npages = mem->memory_size >> PAGE_SHIFT; |