diff options
| author | Jeremy Fitzhardinge | 2009-02-05 20:30:54 +0100 |
|---|---|---|
| committer | Jeremy Fitzhardinge | 2009-02-06 21:31:48 +0100 |
| commit | aca159dbb13a5221819d5b3849b8c013f4829e9e (patch) | |
| tree | 4a915b522be7d5c07a1ce16d6436bd25acbabf14 /arch/x86 | |
| parent | x86: unify pud_page_vaddr (diff) | |
| download | kernel-qcow2-linux-aca159dbb13a5221819d5b3849b8c013f4829e9e.tar.gz kernel-qcow2-linux-aca159dbb13a5221819d5b3849b8c013f4829e9e.tar.xz kernel-qcow2-linux-aca159dbb13a5221819d5b3849b8c013f4829e9e.zip | |
x86: include pgtable_SIZE.h earlier
We'll need the definitions sooner.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 4638b4af6750..bd38feb34921 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -429,6 +429,16 @@ static inline void __init paravirt_pagetable_setup_done(pgd_t *base) } #endif /* CONFIG_PARAVIRT */ +#endif /* __ASSEMBLY__ */ + +#ifdef CONFIG_X86_32 +# include "pgtable_32.h" +#else +# include "pgtable_64.h" +#endif + +#ifndef __ASSEMBLY__ + static inline int pte_none(pte_t pte) { return !pte.pte; @@ -483,12 +493,6 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) #endif /* __ASSEMBLY__ */ -#ifdef CONFIG_X86_32 -# include "pgtable_32.h" -#else -# include "pgtable_64.h" -#endif - /* * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD] * |