diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/kvm_host.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index b4757a1cc4c4..84a994c7a5c5 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
@@ -453,11 +453,9 @@ id_to_memslot(struct kvm_memslots *slots, int id) | |||
453 | } | 453 | } |
454 | 454 | ||
455 | int kvm_set_memory_region(struct kvm *kvm, | 455 | int kvm_set_memory_region(struct kvm *kvm, |
456 | struct kvm_userspace_memory_region *mem, | 456 | struct kvm_userspace_memory_region *mem); |
457 | bool user_alloc); | ||
458 | int __kvm_set_memory_region(struct kvm *kvm, | 457 | int __kvm_set_memory_region(struct kvm *kvm, |
459 | struct kvm_userspace_memory_region *mem, | 458 | struct kvm_userspace_memory_region *mem); |
460 | bool user_alloc); | ||
461 | void kvm_arch_free_memslot(struct kvm_memory_slot *free, | 459 | void kvm_arch_free_memslot(struct kvm_memory_slot *free, |
462 | struct kvm_memory_slot *dont); | 460 | struct kvm_memory_slot *dont); |
463 | int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages); | 461 | int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages); |
@@ -553,9 +551,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, | |||
553 | struct kvm_dirty_log *log); | 551 | struct kvm_dirty_log *log); |
554 | 552 | ||
555 | int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, | 553 | int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, |
556 | struct | 554 | struct kvm_userspace_memory_region *mem); |
557 | kvm_userspace_memory_region *mem, | ||
558 | bool user_alloc); | ||
559 | int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level); | 555 | int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level); |
560 | long kvm_arch_vm_ioctl(struct file *filp, | 556 | long kvm_arch_vm_ioctl(struct file *filp, |
561 | unsigned int ioctl, unsigned long arg); | 557 | unsigned int ioctl, unsigned long arg); |