aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-05 11:30:54 -0800
committerJeremy Fitzhardinge <jeremy@goop.org>2009-02-06 12:31:48 -0800
commitaca159dbb13a5221819d5b3849b8c013f4829e9e (patch)
tree4a915b522be7d5c07a1ce16d6436bd25acbabf14 /arch/x86/include/asm
parent6fff47e3ac5e17f7e164ac4ff9ea29aba3c54d73 (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')
-rw-r--r--arch/x86/include/asm/pgtable.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 4638b4af675..bd38feb3492 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]
*