2 files changed, 10 insertions, 4 deletions

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index bd1c51555038..ad3126a58644 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -955,7 +955,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
                                         kvm_mem.guest_phys_addr;
                 kvm_userspace_mem.memory_size = kvm_mem.memory_size;
                 r = kvm_vm_ioctl_set_memory_region(kvm,
-                                        &kvm_userspace_mem, 0);
+                                        &kvm_userspace_mem, false);
                 if (r)
                         goto out;
                 break;
@@ -1580,7 +1580,7 @@ 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,
-                int user_alloc)
+                bool user_alloc)
 {
         unsigned long i;
         unsigned long pfn;
@@ -1611,7 +1611,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
 void kvm_arch_commit_memory_region(struct kvm *kvm,
                 struct kvm_userspace_memory_region *mem,
                 struct kvm_memory_slot old,
-                int user_alloc)
+                bool user_alloc)
 {
         return;
 }
@@ -1834,7 +1834,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
         mutex_lock(&kvm->slots_lock);
 
         r = -EINVAL;
-        if (log->slot >= KVM_MEMORY_SLOTS)
+        if (log->slot >= KVM_USER_MEM_SLOTS)
                 goto out;
 
         memslot = id_to_memslot(kvm->memslots, log->slot);
diff --git a/arch/ia64/kvm/lapic.h b/arch/ia64/kvm/lapic.h
index c5f92a926a9a..c3e2935b6db4 100644
--- a/arch/ia64/kvm/lapic.h
+++ b/arch/ia64/kvm/lapic.h
@@ -27,4 +27,10 @@ int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq);
 #define kvm_apic_present(x) (true)
 #define kvm_lapic_enabled(x) (true)
 
+static inline bool kvm_apic_vid_enabled(void)
+{
+        /* IA64 has no apicv supporting, do nothing here */
+        return false;
+}
+
 #endif