Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / mips / kvm / kvm_mips.c

diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c
index 2e60b1c78194ddc3709c178bf81d38ec89f07b44..e0dad0289797b292f9b436de9afa492eca0112de 100644 (file)
--- a/arch/mips/kvm/kvm_mips.c
+++ b/arch/mips/kvm/kvm_mips.c
@@ -209,17 +209,17 @@ 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_memory_slot *memslot,
+                                struct kvm_userspace_memory_region *mem,
+                                enum kvm_mr_change change)
 {
        return 0;
 }
 
 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_userspace_memory_region *mem,
+                                const struct kvm_memory_slot *old,
+                                enum kvm_mr_change change)
 {
        unsigned long npages = 0;
        int i, err = 0;