From e979d35e1eb3f04d085d9d282a7c6ad5a165ea4a Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Wed, 30 Jan 2008 13:32:58 +0100 Subject: [PATCH] --- yaml --- r: 80227 b: refs/heads/master c: 015c8dd0cb3b380cb4c3930968250c719d1dd303 h: refs/heads/master i: 80225: 1e3f66a70bbeb9116e4dbbf4b7b670733800857d 80223: 58fd5a0d78ceaef5148d8c1b0600dacf68d64f43 v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/mmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a6ffcd0cc9e9..d179150c3205 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4891645e764d2e181b834509a689fcd12e890c10 +refs/heads/master: 015c8dd0cb3b380cb4c3930968250c719d1dd303 diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c index 52f392893008..3e9e095c295c 100644 --- a/trunk/arch/x86/xen/mmu.c +++ b/trunk/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 }; }