diff options
| author | Takuya Yoshikawa | 2013-02-27 11:41:56 +0100 |
|---|---|---|
| committer | Marcelo Tosatti | 2013-03-05 00:21:08 +0100 |
| commit | 462fce46065ec4b200c08619c047b9e5a8fd154a (patch) | |
| tree | c36cb39e0a8377da88b87ca5b99344357a6c31be /include/linux/kvm_host.h | |
| parent | Merge branch 'master' into queue (diff) | |
| download | kernel-qcow2-linux-462fce46065ec4b200c08619c047b9e5a8fd154a.tar.gz kernel-qcow2-linux-462fce46065ec4b200c08619c047b9e5a8fd154a.tar.xz kernel-qcow2-linux-462fce46065ec4b200c08619c047b9e5a8fd154a.zip | |
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 'include/linux/kvm_host.h')
| -rw-r--r-- | include/linux/kvm_host.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index cad77fe09d77..b4757a1cc4c4 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -464,12 +464,10 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages); 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, - bool user_alloc); + struct kvm_userspace_memory_region *mem); void kvm_arch_commit_memory_region(struct kvm *kvm, struct kvm_userspace_memory_region *mem, - struct kvm_memory_slot old, - bool user_alloc); + struct kvm_memory_slot old); bool kvm_largepages_enabled(void); void kvm_disable_largepages(void); /* flush all memory translations */ |