KVM: MMU: do not record gfn in kvm_mmu_pte_write

[~andy/linux] / arch / x86 / include / asm / kvm_host.h

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index ffd7f8d2918749a8f0a7f6cc4d6467c2fc139e25..f08314f303e0e377b69c74a123c1f780eac9a559 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -85,7 +85,7 @@
 
 #define ASYNC_PF_PER_VCPU 64
 
-extern spinlock_t kvm_lock;
+extern raw_spinlock_t kvm_lock;
 extern struct list_head vm_list;
 
 struct kvm_vcpu;
@@ -336,7 +336,6 @@ struct kvm_vcpu_arch {
        gfn_t last_pte_gfn;
 
        struct {
-               gfn_t gfn;      /* presumed gfn during guest pte update */
                pfn_t pfn;      /* pfn corresponding to that gfn */
                unsigned long mmu_seq;
        } update_pte;
@@ -448,7 +447,7 @@ struct kvm_arch {
 
        unsigned long irq_sources_bitmap;
        s64 kvmclock_offset;
-       spinlock_t tsc_write_lock;
+       raw_spinlock_t tsc_write_lock;
        u64 last_tsc_nsec;
        u64 last_tsc_offset;
        u64 last_tsc_write;