1 files changed, 2 insertions, 2 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 134ec0283a8a..ca54b09adf5b 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1795,8 +1795,10 @@ void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map,
 
         if (map->page)
                 kunmap(map->page);
+#ifdef CONFIG_HAS_IOMEM
         else
                 memunmap(map->hva);
+#endif
 
         if (dirty) {
                 kvm_vcpu_mark_page_dirty(vcpu, map->gfn);
@@ -3149,8 +3151,6 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
         case KVM_CAP_MULTI_ADDRESS_SPACE:
                 return KVM_ADDRESS_SPACE_NUM;
 #endif
-        case KVM_CAP_MAX_VCPU_ID:
-                return KVM_MAX_VCPU_ID;
         case KVM_CAP_NR_MEMSLOTS:
                 return KVM_USER_MEM_SLOTS;
         default: