From: Jeremy Fitzhardinge Date: Thu, 29 Nov 2007 00:21:20 +0000 (-0800) Subject: xen: mask _PAGE_PCD from ptes X-Git-Tag: v2.6.24-rc4~69 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2c80b01beae3db9f99a161ec216405dd694bc4c2;p=linux-2.6-omap-h63xx.git xen: mask _PAGE_PCD from ptes _PAGE_PCD maps a page with caching disabled, which is typically used for mapping harware registers. Xen never allows it to be set on a mapping, and unprivileged guests never need it since they can't see the real underlying hardware. However, some uncached mappings are made early when probing the (non-existent) APIC, and its OK to mask off the PCD flag in these cases. This became necessary because Xen started checking for this bit, rather than silently masking it off. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index b2e32f9d007..0ac6c5dc49b 100644 --- a/arch/x86/xen/mmu.c +++ b/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 }; }