From 5e3c97acd4b42ac4170eca65f79acfc4025972fd Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Mon, 16 Jun 2008 15:01:53 -0700 Subject: [PATCH] --- yaml --- r: 98393 b: refs/heads/master c: 05345b0f006ac226d0d25d48fcb2d792ac44a071 h: refs/heads/master i: 98391: 0569ad43d7412fd0594016d457c5160e8c23a36f v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/enlighten.c | 5 +++++ trunk/arch/x86/xen/mmu.c | 4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b915190db108..9b8fc0f6484a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46539383791a0e59a4af7412056dfbfc5240af0a +refs/heads/master: 05345b0f006ac226d0d25d48fcb2d792ac44a071 diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c index c8a56e457d61..c048de34d6a1 100644 --- a/trunk/arch/x86/xen/enlighten.c +++ b/trunk/arch/x86/xen/enlighten.c @@ -1228,6 +1228,11 @@ asmlinkage void __init xen_start_kernel(void) if (xen_feature(XENFEAT_supervisor_mode_kernel)) pv_info.kernel_rpl = 0; + /* Prevent unwanted bits from being set in PTEs. */ + __supported_pte_mask &= ~_PAGE_GLOBAL; + if (!is_initial_xendomain()) + __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD); + /* set the limit of our address space */ xen_reserve_top(); diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c index 3525ef523a74..3f2a67fe6ad6 100644 --- a/trunk/arch/x86/xen/mmu.c +++ b/trunk/arch/x86/xen/mmu.c @@ -199,10 +199,8 @@ pgdval_t xen_pgd_val(pgd_t pgd) pte_t xen_make_pte(pteval_t pte) { - if (pte & _PAGE_PRESENT) { + if (pte & _PAGE_PRESENT) pte = phys_to_machine(XPADDR(pte)).maddr; - pte &= ~(_PAGE_PCD | _PAGE_PWT); - } return (pte_t){ .pte = pte }; }