public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86, mm: Move declarations level3_ident_pgt and level2_ident_pgt into CONFIG_XEN
@ 2013-07-02 14:43 Zhang Yanfei
  0 siblings, 0 replies; only message in thread
From: Zhang Yanfei @ 2013-07-02 14:43 UTC (permalink / raw)
  To: H. Peter Anvin, tglx, mingo; +Cc: x86, linux-kernel@vger.kernel.org

From: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>

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 <zhangyanfei@cn.fujitsu.com>
---
 arch/x86/include/asm/pgtable_64.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index e22c1db..d0544ec 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -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
-- 
1.7.1

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2013-07-02 14:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-02 14:43 [PATCH] x86, mm: Move declarations level3_ident_pgt and level2_ident_pgt into CONFIG_XEN Zhang Yanfei

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox