aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/kvm_host.h1
-rw-r--r--arch/x86/kvm/mmutrace.h3
-rw-r--r--arch/x86/kvm/x86.c1
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 3c31c5ad37ab..d47d087568fe 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -178,7 +178,6 @@ union kvm_mmu_page_role {
178 unsigned direct:1; 178 unsigned direct:1;
179 unsigned access:3; 179 unsigned access:3;
180 unsigned invalid:1; 180 unsigned invalid:1;
181 unsigned cr4_pge:1;
182 unsigned nxe:1; 181 unsigned nxe:1;
183 }; 182 };
184}; 183};
diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
index 3851f1f3030c..bc4f7f0be2b1 100644
--- a/arch/x86/kvm/mmutrace.h
+++ b/arch/x86/kvm/mmutrace.h
@@ -28,7 +28,7 @@
28 \ 28 \
29 role.word = __entry->role; \ 29 role.word = __entry->role; \
30 \ 30 \
31 trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s %spge" \ 31 trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s" \
32 " %snxe root %u %s%c", \ 32 " %snxe root %u %s%c", \
33 __entry->gfn, role.level, \ 33 __entry->gfn, role.level, \
34 role.cr4_pae ? " pae" : "", \ 34 role.cr4_pae ? " pae" : "", \
@@ -36,7 +36,6 @@
36 role.direct ? " direct" : "", \ 36 role.direct ? " direct" : "", \
37 access_str[role.access], \ 37 access_str[role.access], \
38 role.invalid ? " invalid" : "", \ 38 role.invalid ? " invalid" : "", \
39 role.cr4_pge ? "" : "!", \
40 role.nxe ? "" : "!", \ 39 role.nxe ? "" : "!", \
41 __entry->root_count, \ 40 __entry->root_count, \
42 __entry->unsync ? "unsync" : "sync", 0); \ 41 __entry->unsync ? "unsync" : "sync", 0); \
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 638248c96999..cf37ac6644e0 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -488,7 +488,6 @@ void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
488 } 488 }
489 kvm_x86_ops->set_cr4(vcpu, cr4); 489 kvm_x86_ops->set_cr4(vcpu, cr4);
490 vcpu->arch.cr4 = cr4; 490 vcpu->arch.cr4 = cr4;
491 vcpu->arch.mmu.base_role.cr4_pge = (cr4 & X86_CR4_PGE) && !tdp_enabled;
492 kvm_mmu_reset_context(vcpu); 491 kvm_mmu_reset_context(vcpu);
493} 492}
494EXPORT_SYMBOL_GPL(kvm_set_cr4); 493EXPORT_SYMBOL_GPL(kvm_set_cr4);