[PATCH 4/5] riscv: mm: init: try IS_ENABLED(CONFIG_XIP_KERNEL) instead of #ifdef

[Alexandre ghiti]

On 12/3/21 06:03, Jisheng Zhang wrote:
> Try our best to replace the conditional compilation using
> "#ifdef CONFIG_XIP_KERNEL" with "IS_ENABLED(CONFIG_XIP_KERNEL)", to
> simplify the code and to increase compile coverage.
>
> Signed-off-by: Jisheng Zhang <jszhang at kernel.org>
> ---
>   arch/riscv/mm/init.c | 16 +++++++---------
>   1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index 4d4fcd7ef1a9..4a9e3f429042 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -161,13 +161,13 @@ early_param("mem", early_mem);
>   static void __init setup_bootmem(void)
>   {
>   	phys_addr_t vmlinux_end = __pa_symbol(&_end);
> -	phys_addr_t vmlinux_start = __pa_symbol(&_start);
>   	phys_addr_t __maybe_unused max_mapped_addr;
> -	phys_addr_t phys_ram_end;
> +	phys_addr_t phys_ram_end, vmlinux_start;
>   
> -#ifdef CONFIG_XIP_KERNEL
> -	vmlinux_start = __pa_symbol(&_sdata);
> -#endif
> +	if (IS_ENABLED(CONFIG_XIP_KERNEL))
> +		vmlinux_start = __pa_symbol(&_sdata);
> +	else
> +		vmlinux_start = __pa_symbol(&_start);
>   
>   	memblock_enforce_memory_limit(memory_limit);
>   
> @@ -183,11 +183,9 @@ static void __init setup_bootmem(void)
>   	 */
>   	memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start);
>   
> -
>   	phys_ram_end = memblock_end_of_DRAM();
> -#ifndef CONFIG_XIP_KERNEL
> -	phys_ram_base = memblock_start_of_DRAM();
> -#endif
> +	if (!IS_ENABLED(CONFIG_XIP_KERNEL))
> +		phys_ram_base = memblock_start_of_DRAM();
>   	/*
>   	 * memblock allocator is not aware of the fact that last 4K bytes of
>   	 * the addressable memory can not be mapped because of IS_ERR_VALUE


Reviewed-by: Alexandre Ghiti <alex at ghiti.fr>

Thanks,

Alex