Messages in this thread Patch in this message | | | Subject | [PATCH 01 of 11] xen: fix mismerge in masking pte flags | Date | Fri, 25 Jan 2008 13:23:10 -0800 | From | Jeremy Fitzhardinge <> |
| |
Looks like a mismerge/misapply dropped one of the cases of pte flag masking for Xen. Also, only mask the flags for present ptes.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> --- arch/x86/xen/mmu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -244,8 +244,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 }; } @@ -291,10 +293,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 }; }
| |