diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-09-08 21:40:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-08 21:40:56 +0200 |
| commit | 8ea42bcde1c3c33da7e467d097a288ec3c33b58c (patch) | |
| tree | 049d2b9e8e1a06d369adf93e38de6728fa672b8c | |
| parent | 268860b215bfff433cf7d0b7ebc69a786264f6e8 (diff) | |
| parent | 8a5a5d1530d55e367ef29c80946d0274717617bb (diff) | |
| download | tip-8ea42bcde1c3c33da7e467d097a288ec3c33b58c.tar.gz | |
Merge branch 'x86/urgent'
| -rw-r--r-- | arch/x86/mm/dump_pagetables.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 167ffcac16ed1..95a427e57887a 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" }, |