Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / x86 / mm / dump_pagetables.c

diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index 5bb27fa27973eb06b5c66f21c400b9c49ca2cd3c..ea9c49adaa1fce1f6cbf3962800e0b24bdf72c91 100644 (file)
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -72,9 +72,9 @@ static struct addr_marker address_markers[] = {
        { 0, "User Space" },
 #ifdef CONFIG_X86_64
        { 0x8000000000000000UL, "Kernel Space" },
-       { PAGE_OFFSET,          "Low Kernel Mapping" },
-       { VMALLOC_START,        "vmalloc() Area" },
-       { VMEMMAP_START,        "Vmemmap" },
+       { 0/* PAGE_OFFSET */,   "Low Kernel Mapping" },
+       { 0/* VMALLOC_START */, "vmalloc() Area" },
+       { 0/* VMEMMAP_START */, "Vmemmap" },
 # ifdef CONFIG_X86_ESPFIX64
        { ESPFIX_BASE_ADDR,     "ESPfix Area", 16 },
 # endif
@@ -434,8 +434,16 @@ void ptdump_walk_pgd_level_checkwx(void)
 
 static int __init pt_dump_init(void)
 {
+       /*
+        * Various markers are not compile-time constants, so assign them
+        * here.
+        */
+#ifdef CONFIG_X86_64
+       address_markers[LOW_KERNEL_NR].start_address = PAGE_OFFSET;
+       address_markers[VMALLOC_START_NR].start_address = VMALLOC_START;
+       address_markers[VMEMMAP_START_NR].start_address = VMEMMAP_START;
+#endif
 #ifdef CONFIG_X86_32
-       /* Not a compile-time constant on x86-32 */
        address_markers[VMALLOC_START_NR].start_address = VMALLOC_START;
        address_markers[VMALLOC_END_NR].start_address = VMALLOC_END;
 # ifdef CONFIG_HIGHMEM