From 75c026f514e2fefd3f34bf880c9ed5713c56ba6e Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Wed, 30 Jan 2008 13:33:39 +0100 Subject: [PATCH] --- yaml --- r: 80423 b: refs/heads/master c: a89780f3b84f9a421e2608580b55f12b3ac4f9c2 h: refs/heads/master i: 80421: afd1c3c7b995a063104d792a391c59d86c264a2a 80419: 529d81a3d6925a0371e3c33c8dfc98ffa1b7ea3b 80415: a012f6411f3f092f154a5650536df95f0b7b060b v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/mmu.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5dad0ac24cbd..ac01ca841265 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 261a5ec36befbe6bae069be14f45e618dcd35146 +refs/heads/master: a89780f3b84f9a421e2608580b55f12b3ac4f9c2 diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c index 3e9e095c295c..e6184735545f 100644 --- a/trunk/arch/x86/xen/mmu.c +++ b/trunk/arch/x86/xen/mmu.c @@ -241,8 +241,10 @@ unsigned long long xen_pgd_val(pgd_t pgd) pte_t xen_make_pte(unsigned long long pte) { - if (pte & 1) + if (pte & _PAGE_PRESENT) { pte = phys_to_machine(XPADDR(pte)).maddr; + pte &= ~(_PAGE_PCD | _PAGE_PWT); + } return (pte_t){ .pte = pte }; } @@ -288,10 +290,10 @@ unsigned long xen_pgd_val(pgd_t pgd) pte_t xen_make_pte(unsigned long pte) { - if (pte & _PAGE_PRESENT) + if (pte & _PAGE_PRESENT) { pte = phys_to_machine(XPADDR(pte)).maddr; - - pte &= ~(_PAGE_PCD | _PAGE_PWT); + pte &= ~(_PAGE_PCD | _PAGE_PWT); + } return (pte_t){ pte }; }