x86, mm: Move declarations level3_ident_pgt and level2_ident_pgt into CONFIG_XEN

PATCH New Zhang Yanfei 1 participant 1 message Jul 2, 2013 x86

lore

Share & tools

lore

Zhang Yanfei

author

2013-07-02 14:44 UTC #0 lore raw

PATCH 1/1 x86, mm: Move declarations level3_ident_pgt and level2_ident_pgt into CONFIG_XEN

From: Zhang Yanfei <[email protected]>

After commit 8170e6b ("x86, 64bit: Use a #PF handler to materialize early mappings on demand"), we don't define level3_ident_pgt and level2_ident_pgt if !CONFIG_XEN. So move the two variables' declaration into CONFIG_XEN.

Signed-off-by Zhang Yanfei <[email protected]>

---
 arch/x86/include/asm/pgtable_64.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

arch/x86/include/asm/pgtable_64.h +3 -1

index e22c1db..d0544ec 100644
@@ -15,10 +15,12 @@
 #include <linux/threads.h>
 
 extern pud_t level3_kernel_pgt[512];
+#ifdef CONFIG_XEN
 extern pud_t level3_ident_pgt[512];
+extern pmd_t level2_ident_pgt[512];
+#endif
 extern pmd_t level2_kernel_pgt[512];
 extern pmd_t level2_fixmap_pgt[512];
-extern pmd_t level2_ident_pgt[512];
 extern pgd_t init_level4_pgt[];
 
 #define swapper_pg_dir init_level4_pgt

Signature · 1 line

1.7.1