diff options
| author |   Jeremy Fitzhardinge <jeremy@goop.org> | 2008-01-30 13:33:39 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:39 +0100 |
| commit | a89780f3b84f9a421e2608580b55f12b3ac4f9c2 (patch) | |
| tree | 1e98414b29b773d5d1d234b3390f454e369ae756 /arch/x86/xen | |
| parent | x86: change aper valid checking sequence (diff) | |
| download | linux-dev-a89780f3b84f9a421e2608580b55f12b3ac4f9c2.tar.xz linux-dev-a89780f3b84f9a421e2608580b55f12b3ac4f9c2.zip | |
xen: fix mismerge in masking pte flags
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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/mmu.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 3e9e095c295c..e6184735545f 100644 --- a/arch/x86/xen/mmu.c +++ b/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 }; } |