Skip to contentSkip to conversation

riscv: mm: Remove va_kernel_xip_pa_offset symbol from !XIP case

PATCH In review Jisheng Zhang 2 participants 2 messages Jun 3, 2021 – Jun 12, 2021 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/riscv/mm/init.c | 2 --
 1 file changed, 2 deletions(-)
arch/riscv/mm/init.c +0 -2
index ae32f78207f0..ca2826778989 100644
@@ -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;
Signature · 1 line
2.31.0
maintainer
#1 lore raw
Quoted 13 lines · 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.

---
 arch/riscv/mm/init.c | 2 --
 1 file changed, 2 deletions(-)
arch/riscv/mm/init.c +0 -0
index ae32f78207f0..ca2826778989 100644

arch/riscv/mm/init.c EXPORT_SYMBOL(va_kernel_pa_offset); · line 201

Quoted 10 lines
arch/riscv/mm/init.c +0 -2
@@ -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.