treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 499

[linux-2.6-microblaze.git] / virt / kvm / kvm_main.c

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index f0d13d9..2f2d24a 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Kernel-based Virtual Machine driver for Linux
  *
@@ -10,10 +11,6 @@
  * Authors:
  *   Avi Kivity   <avi@qumranet.com>
  *   Yaniv Kamay  <yaniv@qumranet.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
  */
 
 #include <kvm/iodev.h>
@@ -52,6 +49,7 @@
 #include <linux/sort.h>
 #include <linux/bsearch.h>
 #include <linux/io.h>
+#include <linux/lockdep.h>
 
 #include <asm/processor.h>
 #include <asm/ioctl.h>
@@ -1760,8 +1758,10 @@ static int __kvm_map_gfn(struct kvm_memory_slot *slot, gfn_t gfn,
        if (pfn_valid(pfn)) {
                page = pfn_to_page(pfn);
                hva = kmap(page);
+#ifdef CONFIG_HAS_IOMEM
        } else {
                hva = memremap(pfn_to_hpa(pfn), PAGE_SIZE, MEMREMAP_WB);
+#endif
        }
 
        if (!hva)
@@ -1792,8 +1792,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);
@@ -3146,8 +3148,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:
@@ -4181,7 +4181,9 @@ static int kvm_suspend(void)
 static void kvm_resume(void)
 {
        if (kvm_usage_count) {
-               lockdep_assert_held(&kvm_count_lock);
+#ifdef CONFIG_LOCKDEP
+               WARN_ON(lockdep_is_held(&kvm_count_lock));
+#endif
                hardware_enable_nolock(NULL);
        }
 }