x86: include pgtable_SIZE.h earlier
We'll need the definitions sooner.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 4638b4a..bd38feb 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -429,6 +429,16 @@
}
#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 @@
#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]
*