x86: page.h: make pte_t a union to always include

Make sure pte_t, whatever its definition, has a pte element with type
pteval_t.  This allows common code to access it without needing to be
specifically parameterised on what pagetable mode we're compiling for.
For 32-bit, this means that pte_t becomes a union with "pte" and "{
pte_low, pte_high }" (PAE) or just "pte_low" (non-PAE).

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jeremy Fitzhardinge
2008-01-30 13:32:57 +01:00
committed by Ingo Molnar
parent b7fff536d0
commit c8e5393ab3
10 changed files with 29 additions and 41 deletions

View File

@@ -244,9 +244,7 @@ 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 };
return (pte_t){ .pte = pte };
}
pmd_t xen_make_pmd(unsigned long long pmd)