[PATCH v2] riscv: mm: Drop redundant _sdata and _edata declaration

Palmer Dabbelt palmer at dabbelt.com
Sun May 23 16:07:59 PDT 2021


On Fri, 14 May 2021 02:49:08 PDT (-0700), wangkefeng.wang at huawei.com wrote:
> The _sdata/_edata is already in sections.h, drop redundant
> declaration.
>
> Also move _xiprom/_exiprom declarations at the beginning of
> the file, cleanup one CONFIG_XIP_KERNEL.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang at huawei.com>
> ---
>  arch/riscv/mm/init.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index 4faf8bd157ea..3396e9f1b8e8 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -33,6 +33,7 @@ unsigned long kernel_virt_addr = KERNEL_LINK_ADDR;
>  EXPORT_SYMBOL(kernel_virt_addr);
>  #ifdef CONFIG_XIP_KERNEL
>  #define kernel_virt_addr       (*((unsigned long *)XIP_FIXUP(&kernel_virt_addr)))
> +extern char _xiprom[], _exiprom[];
>  #endif
>
>  unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]
> @@ -176,13 +177,6 @@ void __init setup_bootmem(void)
>  	memblock_allow_resize();
>  }
>
> -#ifdef CONFIG_XIP_KERNEL
> -
> -extern char _xiprom[], _exiprom[];
> -extern char _sdata[], _edata[];
> -
> -#endif /* CONFIG_XIP_KERNEL */
> -
>  #ifdef CONFIG_MMU
>  static struct pt_alloc_ops _pt_ops __ro_after_init;

Thanks, this is on for-next.



More information about the linux-riscv mailing list