From: tip-bot for Mathias Krause <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: arjan.van.de.ven@intel.com, linux-kernel@vger.kernel.org,
hpa@zytor.com, mingo@kernel.org, minipli@googlemail.com,
tglx@linutronix.de
Subject: [tip:x86/urgent] x86-64, ptdump: Mark espfix area only if existent
Date: Mon, 8 Sep 2014 12:01:12 -0700 [thread overview]
Message-ID: <tip-8a5a5d1530d55e367ef29c80946d0274717617bb@git.kernel.org> (raw)
In-Reply-To: <1410114629-24523-1-git-send-email-minipli@googlemail.com>
Commit-ID: 8a5a5d1530d55e367ef29c80946d0274717617bb
Gitweb: http://git.kernel.org/tip/8a5a5d1530d55e367ef29c80946d0274717617bb
Author: Mathias Krause <minipli@googlemail.com>
AuthorDate: Sun, 7 Sep 2014 20:30:29 +0200
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 8 Sep 2014 11:57:34 -0700
x86-64, ptdump: Mark espfix area only if existent
We should classify the espfix area as such only if we actually have
enabled the corresponding option. Otherwise the page table dump might
look confusing.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Link: http://lkml.kernel.org/r/1410114629-24523-1-git-send-email-minipli@googlemail.com
Cc: Arjan van de Ven <arjan.van.de.ven@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/mm/dump_pagetables.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index 167ffca..95a427e 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -48,7 +48,9 @@ enum address_markers_idx {
LOW_KERNEL_NR,
VMALLOC_START_NR,
VMEMMAP_START_NR,
+# ifdef CONFIG_X86_ESPFIX64
ESPFIX_START_NR,
+# endif
HIGH_KERNEL_NR,
MODULES_VADDR_NR,
MODULES_END_NR,
@@ -71,7 +73,9 @@ static struct addr_marker address_markers[] = {
{ PAGE_OFFSET, "Low Kernel Mapping" },
{ VMALLOC_START, "vmalloc() Area" },
{ VMEMMAP_START, "Vmemmap" },
+# ifdef CONFIG_X86_ESPFIX64
{ ESPFIX_BASE_ADDR, "ESPfix Area", 16 },
+# endif
{ __START_KERNEL_map, "High Kernel Mapping" },
{ MODULES_VADDR, "Modules" },
{ MODULES_END, "End Modules" },
prev parent reply other threads:[~2014-09-08 19:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-07 18:30 [PATCH] x86-64, ptdump: Mark espfix area only if existent Mathias Krause
2014-09-08 19:01 ` tip-bot for Mathias Krause [this message]
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=tip-8a5a5d1530d55e367ef29c80946d0274717617bb@git.kernel.org \
--to=tipbot@zytor.com \
--cc=arjan.van.de.ven@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=minipli@googlemail.com \
--cc=tglx@linutronix.de \
/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