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 52f392893008aae5d801cff8f98878c14b0b755d..3e9e095c295ce8566c33688345f81a50f9e54ee9 100644 (file)
--- 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 };
 }