From 4866e47d49eb049044f16fd2aeaa0ddabd658aa9 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Mon, 19 Apr 2010 17:25:53 +0300
Subject: [PATCH] --- yaml --- r: 197757 b: refs/heads/master c:
 87bc3bf972af0585ba5415aebbc8bd09b6a2ee94 h: refs/heads/master i:   197755:
 f5bfdf91727e30ad63942c6eb3392a9df7f829a0 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/include/asm/kvm_host.h | 1 -
 trunk/arch/x86/kvm/mmutrace.h         | 3 +--
 trunk/arch/x86/kvm/x86.c              | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cca1eaf006df..90416040415b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90d83dc3d49f5101addae962ccc1b4aff66b68d8
+refs/heads/master: 87bc3bf972af0585ba5415aebbc8bd09b6a2ee94
diff --git a/trunk/arch/x86/include/asm/kvm_host.h b/trunk/arch/x86/include/asm/kvm_host.h
index 3c31c5ad37ab..d47d087568fe 100644
--- a/trunk/arch/x86/include/asm/kvm_host.h
+++ b/trunk/arch/x86/include/asm/kvm_host.h
@@ -178,7 +178,6 @@ union kvm_mmu_page_role {
 		unsigned direct:1;
 		unsigned access:3;
 		unsigned invalid:1;
-		unsigned cr4_pge:1;
 		unsigned nxe:1;
 	};
 };
diff --git a/trunk/arch/x86/kvm/mmutrace.h b/trunk/arch/x86/kvm/mmutrace.h
index 3851f1f3030c..bc4f7f0be2b1 100644
--- a/trunk/arch/x86/kvm/mmutrace.h
+++ b/trunk/arch/x86/kvm/mmutrace.h
@@ -28,7 +28,7 @@
 								        \
 	role.word = __entry->role;					\
 									\
-	trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s %spge"		\
+	trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s"		\
 			 " %snxe root %u %s%c",				\
 			 __entry->gfn, role.level,			\
 			 role.cr4_pae ? " pae" : "",			\
@@ -36,7 +36,6 @@
 			 role.direct ? " direct" : "",			\
 			 access_str[role.access],			\
 			 role.invalid ? " invalid" : "",		\
-			 role.cr4_pge ? "" : "!",			\
 			 role.nxe ? "" : "!",				\
 			 __entry->root_count,				\
 			 __entry->unsync ? "unsync" : "sync", 0);	\
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 638248c96999..cf37ac6644e0 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -488,7 +488,6 @@ void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
 	}
 	kvm_x86_ops->set_cr4(vcpu, cr4);
 	vcpu->arch.cr4 = cr4;
-	vcpu->arch.mmu.base_role.cr4_pge = (cr4 & X86_CR4_PGE) && !tdp_enabled;
 	kvm_mmu_reset_context(vcpu);
 }
 EXPORT_SYMBOL_GPL(kvm_set_cr4);