From: Zhang Yanfei <zhangyanfei.yes@gmail.com>
To: "H. Peter Anvin" <hpa@zytor.com>, tglx@linutronix.de, mingo@redhat.com
Cc: x86@kernel.org,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86, mm: Move declarations level3_ident_pgt and level2_ident_pgt into CONFIG_XEN
Date: Tue, 02 Jul 2013 22:43:54 +0800 [thread overview]
Message-ID: <51D2E72A.2010509@gmail.com> (raw)
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
reply other threads:[~2013-07-02 14:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51D2E72A.2010509@gmail.com \
--to=zhangyanfei.yes@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox