2021-06-03 13:02:06

by Jisheng Zhang

Subject: [PATCH] riscv: mm: Remove va_kernel_xip_pa_offset symbol from !XIP case

The va_kernel_xip_pa_offset is only accessed for XIP case, so make it
only available for XIP.

Signed-off-by: Jisheng Zhang <[email protected]>
---
arch/riscv/mm/init.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index ae32f78207f0..ca2826778989 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -194,10 +194,8 @@ EXPORT_SYMBOL(va_kernel_pa_offset);
#endif
#ifdef CONFIG_XIP_KERNEL
#define va_kernel_pa_offset (*((unsigned long *)XIP_FIXUP(&va_kernel_pa_offset)))
-#endif
unsigned long va_kernel_xip_pa_offset __ro_after_init;
EXPORT_SYMBOL(va_kernel_xip_pa_offset);
-#ifdef CONFIG_XIP_KERNEL
#define va_kernel_xip_pa_offset (*((unsigned long *)XIP_FIXUP(&va_kernel_xip_pa_offset)))
#endif
unsigned long pfn_base __ro_after_init;
--
2.31.0

2021-06-12 03:58:49

by Palmer Dabbelt

Subject: Re: [PATCH] riscv: mm: Remove va_kernel_xip_pa_offset symbol from !XIP case

On Thu, 03 Jun 2021 05:52:37 PDT (-0700), [email protected] wrote:
> The va_kernel_xip_pa_offset is only accessed for XIP case, so make it
> only available for XIP.
>
> Signed-off-by: Jisheng Zhang <[email protected]>
> ---
> arch/riscv/mm/init.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index ae32f78207f0..ca2826778989 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -194,10 +194,8 @@ EXPORT_SYMBOL(va_kernel_pa_offset);
> #endif
> #ifdef CONFIG_XIP_KERNEL
> #define va_kernel_pa_offset (*((unsigned long *)XIP_FIXUP(&va_kernel_pa_offset)))
> -#endif
> unsigned long va_kernel_xip_pa_offset __ro_after_init;
> EXPORT_SYMBOL(va_kernel_xip_pa_offset);
> -#ifdef CONFIG_XIP_KERNEL
> #define va_kernel_xip_pa_offset (*((unsigned long *)XIP_FIXUP(&va_kernel_xip_pa_offset)))
> #endif
> unsigned long pfn_base __ro_after_init;

This is used outside of XIP now.