Re: linux-next: manual merge of the akpm tree with the arm64-fixes tree

[Catalin Marinas]

On Wed, May 26, 2021 at 04:49:10PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/mm/mmu.c
> index cbcbd64818eb,e3b639e2461d..000000000000
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@@ -515,8 -516,7 +516,7 @@@ static void __init map_mem(pgd_t *pgdp
>   	 */
>   	BUILD_BUG_ON(pgd_index(direct_map_end - 1) == pgd_index(direct_map_end));
>   
> - 	if (rodata_full || crash_mem_map || debug_pagealloc_enabled() ||
> - 	    IS_ENABLED(CONFIG_KFENCE))
>  -	if (can_set_direct_map() || crash_mem_map)
> ++	if (can_set_direct_map() || crash_mem_map || IS_ENABLED(CONFIG_KFENCE))
>   		flags |= NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;

It looks fine. Thanks Stephen.



-- 
Catalin