riscv: Remove 32b kernel mapping from page table dump

The 32b kernel mapping lies in the linear mapping, there is no point in
printing its address in page table dump, so remove this leftover that
comes from moving the kernel mapping outside the linear mapping for 64b
kernel.

Fixes: e9efb21fe352 ("riscv: Prepare ptdump for vm layout dynamic addresses")
Signed-off-by: Alexandre Ghiti <[email protected]>
Reviewed-by: Anup Patel <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>

diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c
index 92179598d8f8a479b78b16aef7b92462cbcd4561..0536ac84b7306947376d2078aa3b8d49f2e8cd4c 100644 (file)
--- a/arch/riscv/mm/ptdump.c
+++ b/arch/riscv/mm/ptdump.c
@@ -76,8 +76,8 @@ enum address_markers_idx {
        PAGE_OFFSET_NR,
 #ifdef CONFIG_64BIT
        MODULES_MAPPING_NR,
        PAGE_OFFSET_NR,
 #ifdef CONFIG_64BIT
        MODULES_MAPPING_NR,

-#endif

        KERNEL_MAPPING_NR,
        KERNEL_MAPPING_NR,

+#endif

        END_OF_SPACE_NR
 };
 
        END_OF_SPACE_NR
 };
 


@@ -99,8 +99,8 @@ static struct addr_marker address_markers[] = {
        {0, "Linear mapping"},
 #ifdef CONFIG_64BIT
        {0, "Modules mapping"},
        {0, "Linear mapping"},
 #ifdef CONFIG_64BIT
        {0, "Modules mapping"},

-#endif

        {0, "Kernel mapping (kernel, BPF)"},
        {0, "Kernel mapping (kernel, BPF)"},

+#endif

        {-1, NULL},
 };
 
        {-1, NULL},
 };
 


@@ -379,8 +379,8 @@ static int __init ptdump_init(void)
        address_markers[PAGE_OFFSET_NR].start_address = PAGE_OFFSET;
 #ifdef CONFIG_64BIT
        address_markers[MODULES_MAPPING_NR].start_address = MODULES_VADDR;
        address_markers[PAGE_OFFSET_NR].start_address = PAGE_OFFSET;
 #ifdef CONFIG_64BIT
        address_markers[MODULES_MAPPING_NR].start_address = MODULES_VADDR;

-#endif

        address_markers[KERNEL_MAPPING_NR].start_address = kernel_virt_addr;
        address_markers[KERNEL_MAPPING_NR].start_address = kernel_virt_addr;

+#endif

 
        kernel_ptd_info.base_addr = KERN_VIRT_START;
 
 
        kernel_ptd_info.base_addr = KERN_VIRT_START;