From 6ac47b1a6bd25d060c25a486e9543b58cd5ba69e Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 28 Nov 2007 16:21:20 -0800
Subject: [PATCH] --- yaml --- r: 74347 b: refs/heads/master c:
 2c80b01beae3db9f99a161ec216405dd694bc4c2 h: refs/heads/master i:   74345:
 2aac5f19763ea460d20ecdbe0c8f192abdd65e6f   74343:
 faf90db35839f83bad9a3be684094f385ccef0f1 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/xen/mmu.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cc5a1ef76865..9976c7da7c36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c06869d660ceffec7dc0fca19ed9646ed5845c7f
+refs/heads/master: 2c80b01beae3db9f99a161ec216405dd694bc4c2
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index b2e32f9d0071..0ac6c5dc49ba 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/arch/x86/xen/mmu.c
@@ -244,6 +244,8 @@ pte_t xen_make_pte(unsigned long long pte)
 	if (pte & 1)
 		pte = phys_to_machine(XPADDR(pte)).maddr;
 
+	pte &= ~_PAGE_PCD;
+
 	return (pte_t){ pte, pte >> 32 };
 }
 
@@ -291,6 +293,8 @@ pte_t xen_make_pte(unsigned long pte)
 	if (pte & _PAGE_PRESENT)
 		pte = phys_to_machine(XPADDR(pte)).maddr;
 
+	pte &= ~_PAGE_PCD;
+
 	return (pte_t){ pte };
 }