[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <mhng-e465b5c3-6c0d-4192-adf7-b4e7f8a76a76@palmerdabbelt-glaptop>
Date: Wed, 28 Apr 2021 23:25:46 -0700 (PDT)
From: Palmer Dabbelt <palmer@...belt.com>
To: alex@...ti.fr
CC: Paul Walmsley <paul.walmsley@...ive.com>, aou@...s.berkeley.edu,
alex@...ti.fr, linux-riscv@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] riscv: Fix 32b kernel build with CONFIG_DEBUG_VIRTUAL=y
On Wed, 28 Apr 2021 03:02:17 PDT (-0700), alex@...ti.fr wrote:
> Declare kernel_virt_addr for 32b kernel since it is used in
> __phys_addr_symbol defined when CONFIG_DEBUG_VIRTUAL is set.
>
> Fixes: 2bfc6cd81bd17 ("riscv: Move kernel mapping outside of linear
> mapping")
> Signed-off-by: Alexandre Ghiti <alex@...ti.fr>
> ---
> arch/riscv/include/asm/page.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h
> index e280ba60cb34..6a7761c86ec2 100644
> --- a/arch/riscv/include/asm/page.h
> +++ b/arch/riscv/include/asm/page.h
> @@ -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) ({ \
Thanks, this is on for-next.
Powered by blists - more mailing lists