summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2010-09-10 17:31:01 +0200
committerAvi Kivity <avi@redhat.com>2010-10-24 10:52:44 +0200
commit2d48a985c7bbcd72b4e92e301ea96bf1252ffc61 (patch)
treedf3c876c8754f57dfc255175ba5f4d9da7c08c77 /arch/x86/include/asm
parent81407ca553c0c852b8cd3f38f3ec362d307f829b (diff)
downloadlinux-2d48a985c7bbcd72b4e92e301ea96bf1252ffc61.tar.bz2
KVM: MMU: Track NX state in struct kvm_mmu
With Nested Paging emulation the NX state between the two MMU contexts may differ. To make sure that always the right fault error code is recorded this patch moves the NX state into struct kvm_mmu so that the code can distinguish between L1 and L2 NX state. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/kvm_host.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index bd59b482f1a8..b43686a44877 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -259,6 +259,8 @@ struct kvm_mmu {
u64 *lm_root;
u64 rsvd_bits_mask[2][4];
+ bool nx;
+
u64 pdptrs[4]; /* pae */
};