Unverified Commit 883fcb8e authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Palmer Dabbelt
Browse files

riscv: Fix 32b kernel build with CONFIG_DEBUG_VIRTUAL=y 



Declare kernel_virt_addr for 32b kernel since it is used in
__phys_addr_symbol defined when CONFIG_DEBUG_VIRTUAL is set.

Fixes: 2bfc6cd8 ("riscv: Move kernel mapping outside of linear mapping")
Signed-off-by: default avatarAlexandre Ghiti <alex@ghiti.fr>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 533b4f3a

arch/riscv/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ extern unsigned long pfn_base; 
#define ARCH_PFN_OFFSET		(PAGE_OFFSET >> PAGE_SHIFT)

#endif /* CONFIG_MMU */



#ifdef CONFIG_64BIT

extern unsigned long kernel_virt_addr;



#ifdef CONFIG_64BIT

#define linear_mapping_pa_to_va(x)	((void *)((unsigned long)(x) + va_pa_offset))

#ifdef CONFIG_XIP_KERNEL

#define kernel_mapping_pa_to_va(y)	({						\