x86-64, ptdump: Mark espfix area only if existent
PATCH 1/1 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 <[email protected]>
Cc Arjan van de Ven <[email protected]>
Cc H. Peter Anvin <[email protected]>
--- arch/x86/mm/dump_pagetables.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/mm/dump_pagetables.c +4 -0
@@ -48,7 +48,9 @@ enum address_markers_idx {LOW_KERNEL_NR ,VMALLOC_START_NR ,VMEMMAP_START_NR , +# ifdef CONFIG_X86_ESPFIX64ESPFIX_START_NR , +# endifHIGH_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" },
Signature · 1 line
1.7.10.4
tip-bot for Mathias Krause
merge botx86-64, ptdump: Mark espfix area only if existent
Commit-ID: 8a5a5d1530d55e367ef29c80946d0274717617bb Gitweb: http://git.kernel.org/tip/8a5a5d1530d55e367ef29c80946d0274717617bb Author: Mathias Krause <[email protected]> AuthorDate: Sun, 7 Sep 2014 20:30:29 +0200 Committer: H. Peter Anvin <[email protected]> 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 <[email protected]>
Cc Arjan van de Ven <[email protected]>
Cc H. Peter Anvin <[email protected]>
Signed-off-by H. Peter Anvin <[email protected]>
--- arch/x86/mm/dump_pagetables.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/mm/dump_pagetables.c +4 -0
@@ -48,7 +48,9 @@ enum address_markers_idx {LOW_KERNEL_NR ,VMALLOC_START_NR ,VMEMMAP_START_NR , +# ifdef CONFIG_X86_ESPFIX64ESPFIX_START_NR , +# endifHIGH_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" },