* [PATCH] x86-64, ptdump: Mark espfix area only if existent
@ 2014-09-07 18:30 Mathias Krause
2014-09-08 19:01 ` [tip:x86/urgent] " tip-bot for Mathias Krause
0 siblings, 1 reply; 2+ messages in thread
From: Mathias Krause @ 2014-09-07 18:30 UTC (permalink / raw)
To: H. Peter Anvin, Thomas Gleixner, Ingo Molnar
Cc: x86, linux-kernel, Mathias Krause, Arjan van de Ven
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>
Cc: Arjan van de Ven <arjan.van.de.ven@intel.com>
Cc: 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 167ffcac16ed..95a427e57887 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" },
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* [tip:x86/urgent] x86-64, ptdump: Mark espfix area only if existent
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
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Mathias Krause @ 2014-09-08 19:01 UTC (permalink / raw)
To: linux-tip-commits
Cc: arjan.van.de.ven, linux-kernel, hpa, mingo, minipli, tglx
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" },
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-08 19:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-07 18:30 [PATCH] x86-64, ptdump: Mark espfix area only if existent Mathias Krause
2014-09-08 19:01 ` [tip:x86/urgent] " tip-bot for Mathias Krause
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox