[PATCH v1 21/27] x86/mm/dump_pagetables: Fix address markers index on x86_64
From: Thomas Garnier via Virtualization <hidden>
Date: 2017-10-11 20:30:21
Subsystem:
the rest, x86 architecture (32-bit and 64-bit), x86 mm · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, Andy Lutomirski, Peter Zijlstra
The address_markers_idx enum is not aligned with the table when EFI is enabled. Add an EFI_VA_END_NR entry in this case. Signed-off-by: Thomas Garnier <redacted> --- arch/x86/mm/dump_pagetables.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index 5e3ac6fe6c9e..8691a57da63e 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c@@ -52,12 +52,15 @@ enum address_markers_idx { LOW_KERNEL_NR, VMALLOC_START_NR, VMEMMAP_START_NR, -#ifdef CONFIG_KASAN +# ifdef CONFIG_KASAN KASAN_SHADOW_START_NR, KASAN_SHADOW_END_NR, -#endif +# endif # ifdef CONFIG_X86_ESPFIX64 ESPFIX_START_NR, +# endif +# ifdef CONFIG_EFI + EFI_VA_END_NR, # endif HIGH_KERNEL_NR, MODULES_VADDR_NR,
--
2.15.0.rc0.271.g36b669edcc-goog