From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Will Deacon <will@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lorenzo Stoakes <lorenzo.stoakes@oracle.com>,
Yang Shi <yang@os.amperecomputing.com>
Subject: Re: linux-next: manual merge of the arm64 tree with the mm-hotfixes tree
Date: Thu, 31 Oct 2024 11:14:10 +0000 [thread overview]
Message-ID: <ZyNmgiZ2e_aKcD9K@arm.com> (raw)
In-Reply-To: <20241031104247.65c76c00@canb.auug.org.au>
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
prev parent reply other threads:[~2024-10-31 11:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-30 23:42 linux-next: manual merge of the arm64 tree with the mm-hotfixes tree Stephen Rothwell
2024-10-31 11:14 ` Catalin Marinas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZyNmgiZ2e_aKcD9K@arm.com \
--to=catalin.marinas@arm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.org \
--cc=yang@os.amperecomputing.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.