From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 30 Jan 2008 12:32:58 +0000 (+0100)
Subject: xen: mask out PWT too
X-Git-Tag: v2.6.25-rc1~1143^2~348
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=015c8dd0cb3b380cb4c3930968250c719d1dd303;p=linux-2.6-omap-h63xx.git

xen: mask out PWT too

The hypervisor doesn't allow PCD or PWT to be set on guest ptes, so
make sure they're masked out.  Also, fix up some previous mispatching.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 52f39289300..3e9e095c295 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -291,7 +291,7 @@ pte_t xen_make_pte(unsigned long pte)
 	if (pte & _PAGE_PRESENT)
 		pte = phys_to_machine(XPADDR(pte)).maddr;
 
-	pte &= ~_PAGE_PCD;
+	pte &= ~(_PAGE_PCD | _PAGE_PWT);
 
 	return (pte_t){ pte };
 }