Unverified Commit fe036db7 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: mm: init: try IS_ENABLED(CONFIG_XIP_KERNEL) instead of #ifdef 



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: default avatarJisheng Zhang <jszhang@kernel.org>
Reviewed-by: default avatarAlexandre Ghiti <alex@ghiti.fr>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 3274a6ef

arch/riscv/mm/init.c

+7 −9
Original line number Diff line number Diff line
@@ -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 max_mapped_addr;

	phys_addr_t phys_ram_end;

	phys_addr_t phys_ram_end, vmlinux_start;



#ifdef CONFIG_XIP_KERNEL

	if (IS_ENABLED(CONFIG_XIP_KERNEL))

		vmlinux_start = __pa_symbol(&_sdata);

#endif

	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

	if (!IS_ENABLED(CONFIG_XIP_KERNEL))

		phys_ram_base = memblock_start_of_DRAM();

#endif

	/*

	 * 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