diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-05 14:30:54 -0500 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-06 15:31:48 -0500 |
commit | aca159dbb13a5221819d5b3849b8c013f4829e9e (patch) | |
tree | 4a915b522be7d5c07a1ce16d6436bd25acbabf14 /arch/x86/include/asm/pgtable.h | |
parent | 6fff47e3ac5e17f7e164ac4ff9ea29aba3c54d73 (diff) |
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/include/asm/pgtable.h')
-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) | |||
429 | } | 429 | } |
430 | #endif /* CONFIG_PARAVIRT */ | 430 | #endif /* CONFIG_PARAVIRT */ |
431 | 431 | ||
432 | #endif /* __ASSEMBLY__ */ | ||
433 | |||
434 | #ifdef CONFIG_X86_32 | ||
435 | # include "pgtable_32.h" | ||
436 | #else | ||
437 | # include "pgtable_64.h" | ||
438 | #endif | ||
439 | |||
440 | #ifndef __ASSEMBLY__ | ||
441 | |||
432 | static inline int pte_none(pte_t pte) | 442 | static inline int pte_none(pte_t pte) |
433 | { | 443 | { |
434 | return !pte.pte; | 444 | return !pte.pte; |
@@ -483,12 +493,6 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) | |||
483 | 493 | ||
484 | #endif /* __ASSEMBLY__ */ | 494 | #endif /* __ASSEMBLY__ */ |
485 | 495 | ||
486 | #ifdef CONFIG_X86_32 | ||
487 | # include "pgtable_32.h" | ||
488 | #else | ||
489 | # include "pgtable_64.h" | ||
490 | #endif | ||
491 | |||
492 | /* | 496 | /* |
493 | * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD] | 497 | * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD] |
494 | * | 498 | * |