---

yaml
---
r: 136791
b: refs/heads/master
c: aca159d
h: refs/heads/master
i:
  136789: 9eec1f3
  136787: 54d0db2
  136783: 61901a9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fff47e3ac5e17f7e164ac4ff9ea29aba3c54d73
+refs/heads/master: aca159dbb13a5221819d5b3849b8c013f4829e9e

trunk/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]
  *