Re: linux-next: manual merge of the arm64 tree with the mm-hotfixes tree

[Catalin Marinas]

On Thu, Oct 31, 2024 at 10:42:47AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/mman.h
> index 798d965760d4,1dbfb56cb313..000000000000
> --- a/arch/arm64/include/asm/mman.h
> +++ b/arch/arm64/include/asm/mman.h
> @@@ -42,7 -39,7 +42,7 @@@ static inline unsigned long arch_calc_v
>   	 * filesystem supporting MTE (RAM-based).
>   	 */
>   	if (system_supports_mte() &&
> - 	    ((flags & MAP_ANONYMOUS) || shmem_file(file)))
>  -	    (flags & (MAP_ANONYMOUS | MAP_HUGETLB)))
> ++	    ((flags & (MAP_ANONYMOUS | MAP_HUGETLB)) || shmem_file(file)))
>   		return VM_MTE_ALLOWED;
>   
>   	return 0;

Thanks Stephen. This looks fine.

-- 
Catalin