From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Will Deacon <will@kernel.org>,
Jisheng Zhang <Jisheng.Zhang@synaptics.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mike Rapoport <rppt@kernel.org>,
Mike Rapoport <rppt@linux.ibm.com>
Subject: Re: linux-next: manual merge of the akpm tree with the arm64-fixes tree
Date: Wed, 26 May 2021 10:02:34 +0100 [thread overview]
Message-ID: <20210526090234.GB19992@arm.com> (raw)
In-Reply-To: <20210526164910.564f598f@canb.auug.org.au>
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
prev parent reply other threads:[~2021-05-26 9:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 6:49 linux-next: manual merge of the akpm tree with the arm64-fixes tree Stephen Rothwell
2021-05-26 9:02 ` 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=20210526090234.GB19992@arm.com \
--to=catalin.marinas@arm.com \
--cc=Jisheng.Zhang@synaptics.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=rppt@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).