arm/arm64: KVM: Get rid of KVM_MEMSLOT_INCOHERENT

KVM_MEMSLOT_INCOHERENT is not used anymore, as we've killed its
only use in the arm/arm64 MMU code. Let's remove the last artifacts.

Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 5cc35080cbf7720ee1a2e9f14c022e2b16dbed7b..962616fd4ddd633289e98b99d99dea9fb758b820 100644 (file)
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -1876,15 +1876,6 @@ void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
 int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
                            unsigned long npages)
 {
-       /*
-        * Readonly memslots are not incoherent with the caches by definition,
-        * but in practice, they are used mostly to emulate ROMs or NOR flashes
-        * that the guest may consider devices and hence map as uncached.
-        * To prevent incoherency issues in these cases, tag all readonly
-        * regions as incoherent.
-        */
-       if (slot->flags & KVM_MEM_READONLY)
-               slot->flags |= KVM_MEMSLOT_INCOHERENT;
        return 0;
 }
 

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 1c5190dab2c1c671ae8a20bf8eaf24c8e6ea735c..cda457bcedc1e3a1c4c031e2b0c0344a5b1e4ae3 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -45,7 +45,6 @@
  * include/linux/kvm_h.
  */
 #define KVM_MEMSLOT_INVALID    (1UL << 16)
-#define KVM_MEMSLOT_INCOHERENT (1UL << 17)
 
 /* Two fragments for cross MMIO pages. */
 #define KVM_MAX_MMIO_FRAGMENTS 2