[PATCH AUTOSEL 5.6 22/47] riscv: Fix print_vm_layout build error if NOMMU

From: Sasha Levin
Date: Thu May 28 2020 - 08:09:55 EST


From: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>

[ Upstream commit 8fa3cdff05f009855a6a99a7d77a41004009bbab ]

arch/riscv/mm/init.c: In function âprint_vm_layoutâ:
arch/riscv/mm/init.c:68:37: error: âFIXADDR_STARTâ undeclared (first use in this function);
arch/riscv/mm/init.c:69:20: error: âFIXADDR_TOPâ undeclared
arch/riscv/mm/init.c:70:37: error: âPCI_IO_STARTâ undeclared
arch/riscv/mm/init.c:71:20: error: âPCI_IO_ENDâ undeclared
arch/riscv/mm/init.c:72:38: error: âVMEMMAP_STARTâ undeclared
arch/riscv/mm/init.c:73:20: error: âVMEMMAP_ENDâ undeclared (first use in this function);

Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
arch/riscv/mm/init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 157924baa191..1dc26384a6c4 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -46,7 +46,7 @@ static void setup_zero_page(void)
memset((void *)empty_zero_page, 0, PAGE_SIZE);
}

-#ifdef CONFIG_DEBUG_VM
+#if defined(CONFIG_MMU) && defined(CONFIG_DEBUG_VM)
static inline void print_mlk(char *name, unsigned long b, unsigned long t)
{
pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t,
--
2.25.1